diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2007-04-25 20:40:23 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:24:30 -0400 |
commit | 4c13eb6657fe9ef7b4dc8f1a405c902e9e5234e0 (patch) | |
tree | d338fad7a61824d8c14c079c0be437ea4ad83f01 /drivers/net/wan | |
parent | 029720f15dcd3c6c16824177cfc486083b229411 (diff) |
[ETH]: Make eth_type_trans set skb->dev like the other *_type_trans
One less thing for drivers writers to worry about.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wan')
-rw-r--r-- | drivers/net/wan/hdlc_fr.c | 1 | ||||
-rw-r--r-- | drivers/net/wan/sbni.c | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index c6c3c757d6f1..3240d10fc86d 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c | |||
@@ -1011,7 +1011,6 @@ static int fr_rx(struct sk_buff *skb) | |||
1011 | stats->rx_bytes += skb->len; | 1011 | stats->rx_bytes += skb->len; |
1012 | if (pvc->state.becn) | 1012 | if (pvc->state.becn) |
1013 | stats->rx_compressed++; | 1013 | stats->rx_compressed++; |
1014 | skb->dev = dev; | ||
1015 | netif_rx(skb); | 1014 | netif_rx(skb); |
1016 | return NET_RX_SUCCESS; | 1015 | return NET_RX_SUCCESS; |
1017 | } else { | 1016 | } else { |
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index fc5c0c611ffd..35eded7ffb2d 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c | |||
@@ -999,11 +999,6 @@ get_rx_buf( struct net_device *dev ) | |||
999 | if( !skb ) | 999 | if( !skb ) |
1000 | return NULL; | 1000 | return NULL; |
1001 | 1001 | ||
1002 | #ifdef CONFIG_SBNI_MULTILINE | ||
1003 | skb->dev = ((struct net_local *) dev->priv)->master; | ||
1004 | #else | ||
1005 | skb->dev = dev; | ||
1006 | #endif | ||
1007 | skb_reserve( skb, 2 ); /* Align IP on longword boundaries */ | 1002 | skb_reserve( skb, 2 ); /* Align IP on longword boundaries */ |
1008 | return skb; | 1003 | return skb; |
1009 | } | 1004 | } |