diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:27 -0400 |
| commit | ceeec3dc375e3b0618f16b34efc56fe093918f8b (patch) | |
| tree | 2293d02721ee05131aaf1c60e4fba7e281585eec /net/netrom/nr_dev.c | |
| parent | fbff868db3a4cc6a89d51da9a6d49b26c29d04fb (diff) | |
| parent | e3ee3b78f83688a0ae4315e8be71b2eac559904a (diff) | |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'net/netrom/nr_dev.c')
| -rw-r--r-- | net/netrom/nr_dev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c index 220bf7494f71..263da4c26494 100644 --- a/net/netrom/nr_dev.c +++ b/net/netrom/nr_dev.c | |||
| @@ -38,8 +38,6 @@ | |||
| 38 | #include <net/ax25.h> | 38 | #include <net/ax25.h> |
| 39 | #include <net/netrom.h> | 39 | #include <net/netrom.h> |
| 40 | 40 | ||
| 41 | #ifdef CONFIG_INET | ||
| 42 | |||
| 43 | /* | 41 | /* |
| 44 | * Only allow IP over NET/ROM frames through if the netrom device is up. | 42 | * Only allow IP over NET/ROM frames through if the netrom device is up. |
| 45 | */ | 43 | */ |
| @@ -64,11 +62,12 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev) | |||
| 64 | skb->nh.raw = skb->data; | 62 | skb->nh.raw = skb->data; |
| 65 | skb->pkt_type = PACKET_HOST; | 63 | skb->pkt_type = PACKET_HOST; |
| 66 | 64 | ||
| 67 | ip_rcv(skb, skb->dev, NULL); | 65 | netif_rx(skb); |
| 68 | 66 | ||
| 69 | return 1; | 67 | return 1; |
| 70 | } | 68 | } |
| 71 | 69 | ||
| 70 | #ifdef CONFIG_INET | ||
| 72 | 71 | ||
| 73 | static int nr_rebuild_header(struct sk_buff *skb) | 72 | static int nr_rebuild_header(struct sk_buff *skb) |
| 74 | { | 73 | { |
