diff options
Diffstat (limited to 'net/netrom/af_netrom.c')
-rw-r--r-- | net/netrom/af_netrom.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 162a85fed150..4b53de982114 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include <linux/proc_fs.h> | 39 | #include <linux/proc_fs.h> |
40 | #include <linux/seq_file.h> | 40 | #include <linux/seq_file.h> |
41 | #include <net/ip.h> | 41 | #include <net/ip.h> |
42 | #include <net/tcp.h> | 42 | #include <net/tcp_states.h> |
43 | #include <net/arp.h> | 43 | #include <net/arp.h> |
44 | #include <linux/init.h> | 44 | #include <linux/init.h> |
45 | 45 | ||
@@ -858,17 +858,16 @@ int nr_rx_frame(struct sk_buff *skb, struct net_device *dev) | |||
858 | frametype = skb->data[19] & 0x0F; | 858 | frametype = skb->data[19] & 0x0F; |
859 | flags = skb->data[19] & 0xF0; | 859 | flags = skb->data[19] & 0xF0; |
860 | 860 | ||
861 | #ifdef CONFIG_INET | ||
862 | /* | 861 | /* |
863 | * Check for an incoming IP over NET/ROM frame. | 862 | * Check for an incoming IP over NET/ROM frame. |
864 | */ | 863 | */ |
865 | if (frametype == NR_PROTOEXT && circuit_index == NR_PROTO_IP && circuit_id == NR_PROTO_IP) { | 864 | if (frametype == NR_PROTOEXT && |
865 | circuit_index == NR_PROTO_IP && circuit_id == NR_PROTO_IP) { | ||
866 | skb_pull(skb, NR_NETWORK_LEN + NR_TRANSPORT_LEN); | 866 | skb_pull(skb, NR_NETWORK_LEN + NR_TRANSPORT_LEN); |
867 | skb->h.raw = skb->data; | 867 | skb->h.raw = skb->data; |
868 | 868 | ||
869 | return nr_rx_ip(skb, dev); | 869 | return nr_rx_ip(skb, dev); |
870 | } | 870 | } |
871 | #endif | ||
872 | 871 | ||
873 | /* | 872 | /* |
874 | * Find an existing socket connection, based on circuit ID, if it's | 873 | * Find an existing socket connection, based on circuit ID, if it's |