diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:29:23 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:29:23 +0200 |
| commit | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (patch) | |
| tree | 9116e5bde860d00685c5b6eee7be5ba9899aabb9 /drivers/usb/net/rndis_host.c | |
| parent | libata: add ata_sg_is_last() helper, use it in several drivers (diff) | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
| download | linux-7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6.tar.xz linux-7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/net/rndis_host.c')
| -rw-r--r-- | drivers/usb/net/rndis_host.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/rndis_host.c b/drivers/usb/net/rndis_host.c index 2ed2e5fb7778..b5a925dc1beb 100644 --- a/drivers/usb/net/rndis_host.c +++ b/drivers/usb/net/rndis_host.c @@ -517,7 +517,7 @@ static int rndis_rx_fixup(struct usbnet *dev, struct sk_buff *skb) } static struct sk_buff * -rndis_tx_fixup(struct usbnet *dev, struct sk_buff *skb, unsigned flags) +rndis_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags) { struct rndis_data_hdr *hdr; struct sk_buff *skb2; |