aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-12 16:40:08 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-12 16:42:13 -0700
commitde081fa517fed81b0369f2e90ca87c30182879c8 (patch)
tree8f01b0c66c2900dec36b11ba1693a05e45cbe26d
parentdd172d72addefd89795e819cc2cc3eb1b9d12a7f (diff)
downloadmrst-s0i3-test-de081fa517fed81b0369f2e90ca87c30182879c8.tar.gz
mrst-s0i3-test-de081fa517fed81b0369f2e90ca87c30182879c8.tar.xz
mrst-s0i3-test-de081fa517fed81b0369f2e90ca87c30182879c8.zip
Revert "[BNX2]: Seems to not need net/tcp.h"
This reverts commit 963bd949b12158d9b5380b718b31c4b33372ed73. The driver _does_ need the networking header files; CC [M] drivers/net/bnx2.o drivers/net/bnx2.c: In function 'bnx2_start_xmit': drivers/net/bnx2.c:5177: warning: implicit declaration of function 'tcp_optlen' drivers/net/bnx2.c:5181: error: invalid application of 'sizeof' to incomplete type 'struct ipv6hdr' drivers/net/bnx2.c:5202: error: invalid application of 'sizeof' to incomplete type 'struct tcphdr' drivers/net/bnx2.c:5207: warning: implicit declaration of function 'tcp_hdr' drivers/net/bnx2.c:5207: error: invalid type argument of '->' make[2]: *** [drivers/net/bnx2.o] Error 1 make[1]: *** [drivers/net] Error 2 make: *** [drivers] Error 2 Cc: Ilpo Jävinen <ilpo.jarvinen@helsinki.fi> Cc: David Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/net/bnx2.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 02e994b1b02..4e5e1cb2adc 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -40,6 +40,7 @@
#define BCM_VLAN 1
#endif
#include <net/ip.h>
+#include <net/tcp.h>
#include <net/checksum.h>
#include <linux/workqueue.h>
#include <linux/crc32.h>