diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 14:16:19 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-27 14:16:19 -0400 |
commit | d1da4e50e5d09f02c340927a4fcb7f54202fa033 (patch) | |
tree | 7f98317bdd45dbdb7644e9179891c5af6a3a8ef1 /drivers/net/rrunner.c | |
parent | 78ab67da1002d954ea4c3e2b441e2483c41f94e8 (diff) | |
parent | a205752d1ad2d37d6597aaae5a56fc396a770868 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/Kconfig
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/net/rrunner.c')
-rw-r--r-- | drivers/net/rrunner.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c index d81536f90df6..25c73d47daad 100644 --- a/drivers/net/rrunner.c +++ b/drivers/net/rrunner.c | |||
@@ -1029,7 +1029,6 @@ static void rx_int(struct net_device *dev, u32 rxlimit, u32 index) | |||
1029 | goto defer; | 1029 | goto defer; |
1030 | } | 1030 | } |
1031 | } | 1031 | } |
1032 | skb->dev = dev; | ||
1033 | skb->protocol = hippi_type_trans(skb, dev); | 1032 | skb->protocol = hippi_type_trans(skb, dev); |
1034 | 1033 | ||
1035 | netif_rx(skb); /* send it up */ | 1034 | netif_rx(skb); /* send it up */ |
@@ -1452,7 +1451,7 @@ static int rr_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1452 | } | 1451 | } |
1453 | skb_reserve(new_skb, 8); | 1452 | skb_reserve(new_skb, 8); |
1454 | skb_put(new_skb, len); | 1453 | skb_put(new_skb, len); |
1455 | memcpy(new_skb->data, skb->data, len); | 1454 | skb_copy_from_linear_data(skb, new_skb->data, len); |
1456 | dev_kfree_skb(skb); | 1455 | dev_kfree_skb(skb); |
1457 | skb = new_skb; | 1456 | skb = new_skb; |
1458 | } | 1457 | } |