From db@adsl-69-107-32-110.dsl.pltn13.pacbell.net Thu Jul 28 20:47:48 2005
Date: Thu, 28 Jul 2005 20:46:32 -0700
From: david-b@pacbell.net
To: greg@kroah.com
Subject: USB: usbnet and unsigned gfp_flags
Message-Id: <20050729034632.B91BDDAD09@adsl-69-107-32-110.dsl.pltn13.pacbell.net>
This just fixes some gfp flags warnings that joined us recently.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/usb/net/usbnet.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
--- gregkh-2.6.orig/drivers/usb/net/usbnet.c 2005-08-02 13:41:29.000000000 -0700
+++ gregkh-2.6/drivers/usb/net/usbnet.c 2005-08-08 15:53:42.000000000 -0700
@@ -252,7 +252,7 @@
/* fixup tx packet (add framing) */
struct sk_buff *(*tx_fixup)(struct usbnet *dev,
- struct sk_buff *skb, int flags);
+ struct sk_buff *skb, unsigned flags);
// FIXME -- also an interrupt mechanism
// useful for at least PL2301/2302 and GL620USB-A
@@ -1144,7 +1144,7 @@
}
static struct sk_buff *ax88772_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
- int flags)
+ unsigned flags)
{
int padlen;
int headroom = skb_headroom(skb);
@@ -1945,7 +1945,7 @@
}
static struct sk_buff *
-genelink_tx_fixup (struct usbnet *dev, struct sk_buff *skb, int flags)
+genelink_tx_fixup (struct usbnet *dev, struct sk_buff *skb, unsigned flags)
{
int padlen;
int length = skb->len;
@@ -2468,7 +2468,7 @@
}
static struct sk_buff *
-net1080_tx_fixup (struct usbnet *dev, struct sk_buff *skb, int flags)
+net1080_tx_fixup (struct usbnet *dev, struct sk_buff *skb, unsigned flags)
{
int padlen;
struct sk_buff *skb2;
@@ -2662,7 +2662,7 @@
*-------------------------------------------------------------------------*/
static struct sk_buff *
-zaurus_tx_fixup (struct usbnet *dev, struct sk_buff *skb, int flags)
+zaurus_tx_fixup (struct usbnet *dev, struct sk_buff *skb, unsigned flags)
{
int padlen;
struct sk_buff *skb2;
@@ -2936,7 +2936,7 @@
static void rx_complete (struct urb *urb, struct pt_regs *regs);
-static void rx_submit (struct usbnet *dev, struct urb *urb, int flags)
+static void rx_submit (struct usbnet *dev, struct urb *urb, unsigned flags)
{
struct sk_buff *skb;
struct skb_data *entry;