diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
| commit | 2016ef789a9ded2e169ad1c028ae3deb5302571f (patch) | |
| tree | 601359f15b42d4d9868b4eadfe909a7bef6435c5 /net/llc/llc_if.c | |
| parent | 7f57356b70dda014ef269135942426e4a852023e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/llc/llc_if.c')
| -rw-r--r-- | net/llc/llc_if.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/llc/llc_if.c b/net/llc/llc_if.c index 0f9fc48aeaf9..0f84f66018e4 100644 --- a/net/llc/llc_if.c +++ b/net/llc/llc_if.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/netdevice.h> | 17 | #include <linux/netdevice.h> |
| 18 | #include <linux/tcp.h> | ||
| 19 | #include <asm/errno.h> | 18 | #include <asm/errno.h> |
| 20 | #include <net/llc_if.h> | 19 | #include <net/llc_if.h> |
| 21 | #include <net/llc_sap.h> | 20 | #include <net/llc_sap.h> |
| @@ -25,6 +24,7 @@ | |||
| 25 | #include <net/llc_c_ev.h> | 24 | #include <net/llc_c_ev.h> |
| 26 | #include <net/llc_c_ac.h> | 25 | #include <net/llc_c_ac.h> |
| 27 | #include <net/llc_c_st.h> | 26 | #include <net/llc_c_st.h> |
| 27 | #include <net/tcp_states.h> | ||
| 28 | 28 | ||
| 29 | u8 llc_mac_null_var[IFHWADDRLEN]; | 29 | u8 llc_mac_null_var[IFHWADDRLEN]; |
| 30 | 30 | ||