1. 20 4月, 2012 2 次提交
  2. 19 4月, 2012 3 次提交
    • E
      tcp: fix retransmit of partially acked frames · 22b4a4f2
      Eric Dumazet 提交于
      Alexander Beregalov reported skb_over_panic errors and provided stack
      trace.
      
      I occurs commit a21d4572 (tcp: avoid order-1 allocations on wifi and
      tx path) added a regression, when a retransmit is done after a partial
      ACK.
      
      tcp_retransmit_skb() tries to aggregate several frames if the first one
      has enough available room to hold the following ones payload. This is
      controlled by /proc/sys/net/ipv4/tcp_retrans_collapse tunable (default :
      enabled)
      
      Problem is we must make sure _pskb_trim_head() doesnt fool
      skb_availroom() when pulling some bytes from skb (this pull is done when
      receiver ACK part of the frame).
      Reported-by: NAlexander Beregalov <a.beregalov@gmail.com>
      Cc: Marc MERLIN <marc@merlins.org>
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      22b4a4f2
    • D
      Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless · 56fa9b16
      David S. Miller 提交于
      From John:
      
      Another batch of fixes intended for 3.4...
      
      First up, we have a minor signedness fix for libertas from Amitkumar
      Karwar.  Next, Arend gives us a brcm80211 fix for correctly enabling
      Tx FIFOs on channels 12 and 13.  Bing Zhao gives us some register
      address corrections for mwifiex.  Felix give us a trio of fixes --
      one for ath9k to wake the hardware properly from full sleep, one for
      mac80211 to properly handle packets in cooked monitor mode, and one
      for ensuring that the proper HT mode selection is honored.
      
      Hauke gives us a bcma fix for handling the lack of an sprom.  Jonathon
      Bither gives us an ath5k fix for a missing THIS_MODULE build issue,
      and another ath5k fix for an io mapping leak.  Lukasz Kucharczyk
      fixes a bitwise check in cfg80211, and Sujith gives us an ath9k fix
      for assigning sequence numbers for fragmented frames.  Finally, we
      have a MAINTAINERS change from Wey-Yi Guy -- congrats to Johannes
      Berg for taking the lead on iwlwifi. :-)
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      56fa9b16
    • J
      Merge branch 'master' of... · dbd717e3
      John W. Linville 提交于
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
      dbd717e3
  3. 18 4月, 2012 15 次提交
  4. 17 4月, 2012 6 次提交
  5. 15 4月, 2012 1 次提交
    • D
      net/ethernet: ks8851_mll fix rx frame buffer overflow · 8a9a0ea6
      Davide Ciminaghi 提交于
      At the beginning of ks_rcv(), a for loop retrieves the
      header information relevant to all the frames stored
      in the mac's internal buffers. The number of pending
      frames is stored as an 8 bits field in KS_RXFCTR.
      If interrupts are disabled long enough to allow for more than
      32 frames to accumulate in the MAC's internal buffers, a buffer
      overflow occurs.
      This patch fixes the problem by making the
      driver's frame_head_info buffer big enough.
      Well actually, since the chip appears to have 12K of
      internal rx buffers and the shortest ethernet frame should
      be 64 bytes long, maybe the limit could be set to
      12*1024/64 = 192 frames, but 255 should be safer.
      Signed-off-by: NDavide Ciminaghi <ciminaghi@gnudd.com>
      Signed-off-by: NRaffaele Recalcati <raffaele.recalcati@bticino.it>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8a9a0ea6
  6. 14 4月, 2012 13 次提交