From 8972c782fee05e51602251514a52079e1a19f995 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 10 Feb 2009 01:54:22 -0800 Subject: [PATCH] --- yaml --- r: 134421 b: refs/heads/master c: e4e90b210dbe8253aaf519ee6efaaab7b2b92034 h: refs/heads/master i: 134419: 9686f097029b2f510cc775ad51c23107d87db368 v: v3 --- [refs] | 2 +- trunk/drivers/net/irda/sir_dev.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8a9bf6f6b47e..ce2e670589fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9034f77bad1e86c4b43e5f5739eb3b8f4878e947 +refs/heads/master: e4e90b210dbe8253aaf519ee6efaaab7b2b92034 diff --git a/trunk/drivers/net/irda/sir_dev.c b/trunk/drivers/net/irda/sir_dev.c index 5b5862499def..c23d211758ae 100644 --- a/trunk/drivers/net/irda/sir_dev.c +++ b/trunk/drivers/net/irda/sir_dev.c @@ -753,7 +753,8 @@ static int sirdev_alloc_buffers(struct sir_dev *dev) dev->rx_buff.truesize = IRDA_SKB_MAX_MTU; /* Bootstrap ZeroCopy Rx */ - dev->rx_buff.skb = __dev_alloc_skb(dev->rx_buff.truesize, GFP_KERNEL); + dev->rx_buff.skb = __netdev_alloc_skb(dev->netdev, dev->rx_buff.truesize, + GFP_KERNEL); if (dev->rx_buff.skb == NULL) return -ENOMEM; skb_reserve(dev->rx_buff.skb, 1);