aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/net/usbnet.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/net/usbnet.c b/drivers/usb/net/usbnet.c
index a2f67245f6da..4682696450db 100644
--- a/drivers/usb/net/usbnet.c
+++ b/drivers/usb/net/usbnet.c
@@ -252,7 +252,7 @@ struct driver_info {
252 252
253 /* fixup tx packet (add framing) */ 253 /* fixup tx packet (add framing) */
254 struct sk_buff *(*tx_fixup)(struct usbnet *dev, 254 struct sk_buff *(*tx_fixup)(struct usbnet *dev,
255 struct sk_buff *skb, int flags); 255 struct sk_buff *skb, unsigned flags);
256 256
257 // FIXME -- also an interrupt mechanism 257 // FIXME -- also an interrupt mechanism
258 // useful for at least PL2301/2302 and GL620USB-A 258 // useful for at least PL2301/2302 and GL620USB-A
@@ -1144,7 +1144,7 @@ static int ax88772_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
1144} 1144}
1145 1145
1146static struct sk_buff *ax88772_tx_fixup(struct usbnet *dev, struct sk_buff *skb, 1146static struct sk_buff *ax88772_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
1147 int flags) 1147 unsigned flags)
1148{ 1148{
1149 int padlen; 1149 int padlen;
1150 int headroom = skb_headroom(skb); 1150 int headroom = skb_headroom(skb);
@@ -1945,7 +1945,7 @@ static int genelink_rx_fixup (struct usbnet *dev, struct sk_buff *skb)
1945} 1945}
1946 1946
1947static struct sk_buff * 1947static struct sk_buff *
1948genelink_tx_fixup (struct usbnet *dev, struct sk_buff *skb, int flags) 1948genelink_tx_fixup (struct usbnet *dev, struct sk_buff *skb, unsigned flags)
1949{ 1949{
1950 int padlen; 1950 int padlen;
1951 int length = skb->len; 1951 int length = skb->len;
@@ -2468,7 +2468,7 @@ static int net1080_rx_fixup (struct usbnet *dev, struct sk_buff *skb)
2468} 2468}
2469 2469
2470static struct sk_buff * 2470static struct sk_buff *
2471net1080_tx_fixup (struct usbnet *dev, struct sk_buff *skb, int flags) 2471net1080_tx_fixup (struct usbnet *dev, struct sk_buff *skb, unsigned flags)
2472{ 2472{
2473 int padlen; 2473 int padlen;
2474 struct sk_buff *skb2; 2474 struct sk_buff *skb2;
@@ -2662,7 +2662,7 @@ static const struct driver_info blob_info = {
2662 *-------------------------------------------------------------------------*/ 2662 *-------------------------------------------------------------------------*/
2663 2663
2664static struct sk_buff * 2664static struct sk_buff *
2665zaurus_tx_fixup (struct usbnet *dev, struct sk_buff *skb, int flags) 2665zaurus_tx_fixup (struct usbnet *dev, struct sk_buff *skb, unsigned flags)
2666{ 2666{
2667 int padlen; 2667 int padlen;
2668 struct sk_buff *skb2; 2668 struct sk_buff *skb2;
@@ -2935,7 +2935,7 @@ static void defer_kevent (struct usbnet *dev, int work)
2935 2935
2936static void rx_complete (struct urb *urb, struct pt_regs *regs); 2936static void rx_complete (struct urb *urb, struct pt_regs *regs);
2937 2937
2938static void rx_submit (struct usbnet *dev, struct urb *urb, int flags) 2938static void rx_submit (struct usbnet *dev, struct urb *urb, unsigned flags)
2939{ 2939{
2940 struct sk_buff *skb; 2940 struct sk_buff *skb;
2941 struct skb_data *entry; 2941 struct skb_data *entry;