git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
usb
/
net
/
net1080.c
diff --git
a/drivers/usb/net/net1080.c
b/drivers/usb/net/net1080.c
index
78e6a43
..
4936359
100644
(file)
--- a/
drivers/usb/net/net1080.c
+++ b/
drivers/usb/net/net1080.c
@@
-20,7
+20,6
@@
// #define DEBUG // error path messages, extra info
// #define VERBOSE // more; success messages
// #define DEBUG // error path messages, extra info
// #define VERBOSE // more; success messages
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/init.h>
@@
-238,12
+237,12
@@
static inline void nc_dump_usbctl(struct usbnet *dev, u16 usbctl)
#define STATUS_CONN_OTHER (1 << 14)
#define STATUS_SUSPEND_OTHER (1 << 13)
#define STATUS_MAILBOX_OTHER (1 << 12)
#define STATUS_CONN_OTHER (1 << 14)
#define STATUS_SUSPEND_OTHER (1 << 13)
#define STATUS_MAILBOX_OTHER (1 << 12)
-#define STATUS_PACKETS_OTHER(n) (((n) >> 8) &
&
0x03)
+#define STATUS_PACKETS_OTHER(n) (((n) >> 8) & 0x03)
#define STATUS_CONN_THIS (1 << 6)
#define STATUS_SUSPEND_THIS (1 << 5)
#define STATUS_MAILBOX_THIS (1 << 4)
#define STATUS_CONN_THIS (1 << 6)
#define STATUS_SUSPEND_THIS (1 << 5)
#define STATUS_MAILBOX_THIS (1 << 4)
-#define STATUS_PACKETS_THIS(n) (((n) >> 0) &
&
0x03)
+#define STATUS_PACKETS_THIS(n) (((n) >> 0) & 0x03)
#define STATUS_UNSPEC_MASK 0x0c8c
#define STATUS_NOISE_MASK ((u16)~(0x0303|STATUS_UNSPEC_MASK))
#define STATUS_UNSPEC_MASK 0x0c8c
#define STATUS_NOISE_MASK ((u16)~(0x0303|STATUS_UNSPEC_MASK))
@@
-369,7
+368,7
@@
static int net1080_check_connect(struct usbnet *dev)
return 0;
}
return 0;
}
-static void nc_flush_complete(struct urb *urb
, struct pt_regs *regs
)
+static void nc_flush_complete(struct urb *urb)
{
kfree(urb->context);
usb_free_urb(urb);
{
kfree(urb->context);
usb_free_urb(urb);
@@
-384,7
+383,7
@@
static void nc_ensure_sync(struct usbnet *dev)
int status;
/* Send a flush */
int status;
/* Send a flush */
- urb = usb_alloc_urb(0,
SLAB
_ATOMIC);
+ urb = usb_alloc_urb(0,
GFP
_ATOMIC);
if (!urb)
return;
if (!urb)
return;
@@
-499,25
+498,24
@@
static int net1080_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
static struct sk_buff *
net1080_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
{
static struct sk_buff *
net1080_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
{
- int padlen;
struct sk_buff *skb2;
struct nc_header *header = NULL;
struct nc_trailer *trailer = NULL;
struct sk_buff *skb2;
struct nc_header *header = NULL;
struct nc_trailer *trailer = NULL;
+ int padlen = sizeof (struct nc_trailer);
int len = skb->len;
int len = skb->len;
-
padlen = ((len + sizeof (struct nc_header
)
-
+ sizeof (struct nc_trailer)) & 0x01) ? 0 : 1
;
+
if (!((len + padlen + sizeof (struct nc_header)) & 0x01)
)
+
padlen++
;
if (!skb_cloned(skb)) {
int headroom = skb_headroom(skb);
int tailroom = skb_tailroom(skb);
if (!skb_cloned(skb)) {
int headroom = skb_headroom(skb);
int tailroom = skb_tailroom(skb);
- if (
(padlen + sizeof (struct nc_trailer)) <= tailroom
-
&& sizeof
(struct nc_header) <= headroom)
+ if (
padlen <= tailroom &&
+
sizeof
(struct nc_header) <= headroom)
/* There's enough head and tail room */
goto encapsulate;
/* There's enough head and tail room */
goto encapsulate;
- if ((sizeof (struct nc_header) + padlen
- + sizeof (struct nc_trailer)) <
+ if ((sizeof (struct nc_header) + padlen) <
(headroom + tailroom)) {
/* There's enough total room, so just readjust */
skb->data = memmove(skb->head
(headroom + tailroom)) {
/* There's enough total room, so just readjust */
skb->data = memmove(skb->head
@@
-531,7
+529,7
@@
net1080_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
/* Create a new skb to use with the correct size */
skb2 = skb_copy_expand(skb,
sizeof (struct nc_header),
/* Create a new skb to use with the correct size */
skb2 = skb_copy_expand(skb,
sizeof (struct nc_header),
-
sizeof (struct nc_trailer) +
padlen,
+ padlen,
flags);
dev_kfree_skb_any(skb);
if (!skb2)
flags);
dev_kfree_skb_any(skb);
if (!skb2)