1. 04 3月, 2012 4 次提交
  2. 02 3月, 2012 7 次提交
  3. 01 3月, 2012 15 次提交
  4. 29 2月, 2012 4 次提交
  5. 28 2月, 2012 3 次提交
  6. 27 2月, 2012 7 次提交
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · ff4783ce
      David S. Miller 提交于
      Conflicts:
      	drivers/net/ethernet/sfc/rx.c
      
      Overlapping changes in drivers/net/ethernet/sfc/rx.c, one to change
      the rx_buf->is_page boolean into a set of u16 flags, and another to
      adjust how ->ip_summed is initialized.
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ff4783ce
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 203738e5
      Linus Torvalds 提交于
      1) ICMP sockets leave err uninitialized but we try to return it for the
         unsupported MSG_OOB case, reported by Dave Jones.
      
      2) Add new Zaurus device ID entries, from Dave Jones.
      
      3) Pointer calculation in hso driver memset is wrong, from Dan
         Carpenter.
      
      4) ks8851_probe() checks unsigned value as negative, fix also from Dan
         Carpenter.
      
      5) Fix crashes in atl1c driver due to TX queue handling, from Eric
         Dumazet.  I anticipate some TX side locking fixes coming in the near
         future for this driver as well.
      
      6) The inline directive fix in Bluetooth which was breaking the build
         only with very new versions of GCC, from Johan Hedberg.
      
      7) Fix crashes in the ATP CLIP code due to ARP cleanups this merge
         window, reported by Meelis Roos and fixed by Eric Dumazet.
      
      8) JME driver doesn't flush RX FIFO correctly, from Guo-Fu Tseng.
      
      9) Some ip6_route_output() callers test the return value for NULL, but
         this never happens as the convention is to return a dst entry with
         dst->error set.  Fixes from RonQing Li.
      
      10) Logitech Harmony 900 should be handled by zaurus driver not
         cdc_ether, update white lists and black lists accordingly.  From
         Scott Talbert.
      
      11) Receiving from certain kinds of devices there won't be a MAC header,
         so there is no MAC header to fixup in the IPSEC code, and if we try
         to do it we'll crash.  Fix from Eric Dumazet.
      
      12) Port type array indexing off-by-one in mlx4 driver, fix from Yevgeny
         Petrilin.
      
      13) Fix regression in link-down handling in davinci_emac which causes
         all RX descriptors to be freed up and therefore RX to wedge
         completely, from Christian Riesch.
      
      14) It took two attempts, but ctnetlink soft lockups seem to be
         cured now, from Pablo Neira Ayuso.
      
      15) Endianness bug fix in ENIC driver, from Santosh Nayak.
      
      16) The long ago conversion of the PPP fragmentation code over to
         abstracted SKB list handling wasn't perfect, once we get an
         out of sequence SKB we don't flush the rest of them like we
         should.  From Ben McKeegan.
      
      17) Fix regression of ->ip_summed initialization in sfc driver.
         From Ben Hutchings.
      
      18) Bluetooth timeout mistakenly using msecs instead of jiffies,
         from Andrzej Kaczmarek.
      
      19) Using _sync variant of work cancellation results in deadlocks,
         use the non _sync variants instead.  From Andre Guedes.
      
      20) Bluetooth rfcomm code had reference counting problems leading
         to crashes, fix from Octavian Purdila.
      
      21) The conversion of netem over to classful qdisc handling added
         two bugs to netem_dequeue(), fixes from Eric Dumazet.
      
      22) Missing pci_iounmap() in ATM Solos driver.  Fix from Julia Lawall.
      
      23) b44_pci_exit() should not have __exit tag since it's invoked from
         non-__exit code.  From Nikola Pajkovsky.
      
      24) The conversion of the neighbour hash tables over to RCU added a
         race, fixed here by adding the necessary reread of tbl->nht, fix
         from Michel Machado.
      
      25) When we added VF (virtual function) attributes for network device
         dumps, this potentially bloats up the size of the dump of one
         network device such that the dump size is too large for the buffer
         allocated by properly written netlink applications.
      
         In particular, if you add 255 VFs to a network device, parts of
         GLIBC stop working.
      
         To fix this, we add an attribute that is used to turn on these
         extended portions of the network device dump.  Sophisticaed
         applications like 'ip' that want to see this stuff  will be changed
         to set the attribute, whereas things like GLIBC that don't care
         about VFs simply will not, and therefore won't be busted by the
         mere presence of VFs on a network device.
      
         Thanks to the tireless work of Greg Rose on this fix.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (53 commits)
        sfc: Fix assignment of ip_summed for pre-allocated skbs
        ppp: fix 'ppp_mp_reconstruct bad seq' errors
        enic: Fix endianness bug.
        gre: fix spelling in comments
        netfilter: ctnetlink: fix soft lockup when netlink adds new entries (v2)
        Revert "netfilter: ctnetlink: fix soft lockup when netlink adds new entries"
        davinci_emac: Do not free all rx dma descriptors during init
        mlx4_core: Fixing array indexes when setting port types
        phy: IC+101G and PHY_HAS_INTERRUPT flag
        netdev/phy/icplus: Correct broken phy_init code
        ipsec: be careful of non existing mac headers
        Move Logitech Harmony 900 from cdc_ether to zaurus
        hso: memsetting wrong data in hso_get_count()
        netfilter: ip6_route_output() never returns NULL.
        ethernet/broadcom: ip6_route_output() never returns NULL.
        ipv6: ip6_route_output() never returns NULL.
        jme: Fix FIFO flush issue
        atm: clip: remove clip_tbl
        ipv4: ping: Fix recvmsg MSG_OOB error handling.
        rtnetlink: Fix problem with buffer allocation
        ...
      203738e5
    • E
      mlx4_en: dont change mac_header on xmit · 62212171
      Eric Dumazet 提交于
      A driver xmit function is not allowed to change skb without special
      care.
      
      mlx4_en_xmit() should not call skb_reset_mac_header() and instead should
      use skb->data to access ethernet header.
      
      This removes a dumb test : if (ethh && ethh->h_dest)
      
      Also remove this slow mlx4_en_mac_to_u64() call, we can use
      get_unaligned() to get faster code.
      Signed-off-by: NEric Dumazet <eric.dumazet@gmail.com>
      Cc: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      62212171
    • P
      netfilter: ctnetlink: support kernel-space dump filtering by ctmark · 0f298a28
      Pablo Neira Ayuso 提交于
      This patch adds CTA_MARK_MASK which, together with CTA_MARK, allows
      you to selectively send conntrack entries to user-space by
      returning those that match mark & mask.
      
      With this, we can save cycles in the building and the parsing of
      the entries that may be later on filtered out in user-space by using
      the ctmark & mask.
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0f298a28
    • P
      netlink: allow to pass data pointer to netlink_dump_start() callback · 7175c883
      Pablo Neira Ayuso 提交于
      This patch allows you to pass a data pointer that can be
      accessed from the dump callback.
      
      Netfilter is going to use this patch to provide filtered dumps
      to user-space. This is specifically interesting in ctnetlink that
      may handle lots of conntrack entries. We can save precious
      cycles by skipping the conversion to TLV format of conntrack
      entries that are not interesting for user-space.
      
      More specifically, ctnetlink will include one operation to allow
      to filter the dumping of conntrack entries by ctmark values.
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7175c883
    • P
      netlink: add netlink_dump_control structure for netlink_dump_start() · 80d326fa
      Pablo Neira Ayuso 提交于
      Davem considers that the argument list of this interface is getting
      out of control. This patch tries to address this issue following
      his proposal:
      
      struct netlink_dump_control c = { .dump = dump, .done = done, ... };
      
      netlink_dump_start(..., &c);
      
      Suggested by David S. Miller.
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      80d326fa
    • L
      Fix autofs compile without CONFIG_COMPAT · 3c761ea0
      Linus Torvalds 提交于
      The autofs compat handling fix caused a compile failure when
      CONFIG_COMPAT isn't defined.
      
      Instead of adding random #ifdef'fery in autofs, let's just make the
      compat helpers earlier to use: without CONFIG_COMPAT, is_compat_task()
      just hardcodes to zero.
      
      We could probably do something similar for a number of other cases where
      we have #ifdef's in code, but this is the low-hanging fruit.
      Reported-and-tested-by: NAndreas Schwab <schwab@linux-m68k.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3c761ea0