1. 23 Oct, 2012 3 commits
    • Joachim Eastwood's avatar
      net/cadence: get rid of HAVE_NET_MACB · 84222e20
      Joachim Eastwood authored
      macb is a platform driver and there is nothing that prevents
      this driver from being built on non-ARM/AVR32 platforms.
      Signed-off-by: default avatarJoachim Eastwood <manabian@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      84222e20
    • Joachim Eastwood's avatar
      net/macb: fix truncate warnings · 95ebcea6
      Joachim Eastwood authored
      When building macb on x86_64 the following warnings show up:
        drivers/net/ethernet/cadence/macb.c: In function macb_interrupt:
        drivers/net/ethernet/cadence/macb.c:556:4: warning: large integer implicitly truncated to unsigned type [-Woverflow]
        drivers/net/ethernet/cadence/macb.c: In function macb_reset_hw:
        drivers/net/ethernet/cadence/macb.c:792:2: warning: large integer implicitly truncated to unsigned type [-Woverflow]
        drivers/net/ethernet/cadence/macb.c:793:2: warning: large integer implicitly truncated to unsigned type [-Woverflow]
        drivers/net/ethernet/cadence/macb.c:796:2: warning: large integer implicitly truncated to unsigned type [-Woverflow]
      
      Use -1 insted of ~0UL, as done in other places in the driver,
      to silence these warnings.
      Signed-off-by: default avatarJoachim Eastwood <manabian@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      95ebcea6
    • Nicolas Dichtel's avatar
      ipv6: add support of equal cost multipath (ECMP) · 51ebd318
      Nicolas Dichtel authored
      Each nexthop is added like a single route in the routing table. All routes
      that have the same metric/weight and destination but not the same gateway
      are considering as ECMP routes. They are linked together, through a list called
      rt6i_siblings.
      
      ECMP routes can be added in one shot, with RTA_MULTIPATH attribute or one after
      the other (in both case, the flag NLM_F_EXCL should not be set).
      
      The patch is based on a previous work from
      Luc Saillard <luc.saillard@6wind.com>.
      Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      51ebd318
  2. 22 Oct, 2012 23 commits
  3. 20 Oct, 2012 1 commit
    • David S. Miller's avatar
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next · 72ec301a
      David S. Miller authored
      Jeff Kirsher says:
      
      ====================
      This series contains updates to ixgbe and igb.
      
      Alexander Duyck (13):
        ixgbe: Initialize q_vector cpu and affinity masks correctly
        ixgbe: Enable jumbo frames support w/ SR-IOV
        ixgbe: Move message handling routines into their own functions
        ixgbe: Add mailbox API version negotiation support to ixgbe PF
        igb: Split Rx timestamping into two separate functions
        igb: Do not use header split, instead receive all frames into a
          single buffer
        igb: Combine post-processing of skb into a single function
        igb: Map entire page and sync half instead of mapping and unmapping
          half pages
        igb: Move rx_buffer related code in Rx cleanup path into separate
          function
        igb: Lock buffer size at 2K even on systems with larger pages
        igb: Combine q_vector and ring allocation into a single function
        igb: Move the calls to set the Tx and Rx queues into igb_open
        igb: Split igb_update_dca into separate Tx and Rx functions
      
      Tushar Dave (1):
        igb: Correcting and improving small packet check and padding
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      72ec301a
  4. 19 Oct, 2012 13 commits