diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2011-11-22 05:57:41 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-22 16:43:32 -0500 |
commit | 1f2149c1df50c8c712950872675f46e6e44629f0 (patch) | |
tree | a33a556696e27611b6b38cdcbb6de9315f483bd4 /drivers/net/usb | |
parent | 84b405011166e663fe9ef56c29b1d76f59b35568 (diff) |
net: remove netdev_alloc_page and use __GFP_COLD
Given we dont use anymore the struct net_device *dev argument, and this
interface brings litle benefit, remove netdev_{alloc|free}_page(), to
debloat include/linux/skbuff.h a bit.
(Some drivers used a mix of these interfaces and alloc_pages())
When allocating a page given to device for DMA transfer (device to
memory), it makes sense to use a cold one (__GFP_COLD)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: Dimitris Michailidis <dm@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/cdc-phonet.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c index a60d0069cc45..331e44056f5a 100644 --- a/drivers/net/usb/cdc-phonet.c +++ b/drivers/net/usb/cdc-phonet.c | |||
@@ -130,7 +130,7 @@ static int rx_submit(struct usbpn_dev *pnd, struct urb *req, gfp_t gfp_flags) | |||
130 | struct page *page; | 130 | struct page *page; |
131 | int err; | 131 | int err; |
132 | 132 | ||
133 | page = __netdev_alloc_page(dev, gfp_flags); | 133 | page = alloc_page(gfp_flags); |
134 | if (!page) | 134 | if (!page) |
135 | return -ENOMEM; | 135 | return -ENOMEM; |
136 | 136 | ||
@@ -140,7 +140,7 @@ static int rx_submit(struct usbpn_dev *pnd, struct urb *req, gfp_t gfp_flags) | |||
140 | err = usb_submit_urb(req, gfp_flags); | 140 | err = usb_submit_urb(req, gfp_flags); |
141 | if (unlikely(err)) { | 141 | if (unlikely(err)) { |
142 | dev_dbg(&dev->dev, "RX submit error (%d)\n", err); | 142 | dev_dbg(&dev->dev, "RX submit error (%d)\n", err); |
143 | netdev_free_page(dev, page); | 143 | put_page(page); |
144 | } | 144 | } |
145 | return err; | 145 | return err; |
146 | } | 146 | } |
@@ -208,9 +208,9 @@ static void rx_complete(struct urb *req) | |||
208 | dev->stats.rx_errors++; | 208 | dev->stats.rx_errors++; |
209 | resubmit: | 209 | resubmit: |
210 | if (page) | 210 | if (page) |
211 | netdev_free_page(dev, page); | 211 | put_page(page); |
212 | if (req) | 212 | if (req) |
213 | rx_submit(pnd, req, GFP_ATOMIC); | 213 | rx_submit(pnd, req, GFP_ATOMIC | __GFP_COLD); |
214 | } | 214 | } |
215 | 215 | ||
216 | static int usbpn_close(struct net_device *dev); | 216 | static int usbpn_close(struct net_device *dev); |
@@ -229,7 +229,7 @@ static int usbpn_open(struct net_device *dev) | |||
229 | for (i = 0; i < rxq_size; i++) { | 229 | for (i = 0; i < rxq_size; i++) { |
230 | struct urb *req = usb_alloc_urb(0, GFP_KERNEL); | 230 | struct urb *req = usb_alloc_urb(0, GFP_KERNEL); |
231 | 231 | ||
232 | if (!req || rx_submit(pnd, req, GFP_KERNEL)) { | 232 | if (!req || rx_submit(pnd, req, GFP_KERNEL | __GFP_COLD)) { |
233 | usbpn_close(dev); | 233 | usbpn_close(dev); |
234 | return -ENOMEM; | 234 | return -ENOMEM; |
235 | } | 235 | } |