Message ID | 1382795642-12501-4-git-send-email-alex.aring@gmail.com |
---|---|
State | Superseded, archived |
Delegated to: | David Miller |
Headers | show |
On Sat, Oct 26, 2013 at 03:54:00PM +0200, Alexander Aring wrote: > This patch uses the netdev_alloc_skb instead dev_alloc_skb function and > drops the seperate assignment to skb->dev. > > Signed-off-by: Alexander Aring <alex.aring@gmail.com> > Reviewed-by: Werner Almesberger <werner@almesberger.net> > --- > net/ieee802154/6lowpan.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c > index 9057f83..1884a84 100644 > --- a/net/ieee802154/6lowpan.c > +++ b/net/ieee802154/6lowpan.c > @@ -1127,12 +1127,12 @@ lowpan_fragment_xmit(struct sk_buff *skb, u8 *head, > > lowpan_raw_dump_inline(__func__, "6lowpan fragment header", head, hlen); > > - frag = dev_alloc_skb(hlen + mlen + plen + IEEE802154_MFR_SIZE); > + frag = netdev_alloc_skb(skb->dev, hlen + mlen + > + plen + IEEE802154_MFR_SIZE); mhh, I do the same mistake again. I will resend them. Sorry for the noise. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ieee802154/6lowpan.c b/net/ieee802154/6lowpan.c index 9057f83..1884a84 100644 --- a/net/ieee802154/6lowpan.c +++ b/net/ieee802154/6lowpan.c @@ -1127,12 +1127,12 @@ lowpan_fragment_xmit(struct sk_buff *skb, u8 *head, lowpan_raw_dump_inline(__func__, "6lowpan fragment header", head, hlen); - frag = dev_alloc_skb(hlen + mlen + plen + IEEE802154_MFR_SIZE); + frag = netdev_alloc_skb(skb->dev, hlen + mlen + + plen + IEEE802154_MFR_SIZE); if (!frag) return -ENOMEM; frag->priority = skb->priority; - frag->dev = skb->dev; /* copy header, MFR and payload */ memcpy(skb_put(frag, mlen), skb->data, mlen);