Merge branch 'tg3-next'

Browse source

Michael Chan says:

====================
tg3: TSO related enhancements to prevent memory allocation failure

Michael Chan (3):
  tg3: Don't modify ip header fields when doing GSO
  tg3: Prevent page allocation failure during TSO workaround
  tg3: Update copyright and version to 3.137
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2014-05-13 18:39:01 -04:00

parent b6bd26c4de de750e4c4b

commit 1e1c77bfde

2 changed files with 35 additions and 18 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

51

drivers/net/ethernet/broadcom/tg3.c

View file

2

drivers/net/ethernet/broadcom/tg3.h

View file