From dee25c2bdd5f4cb2c605360ea5a2bf189b82e2be Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Thu, 9 Nov 2006 22:02:37 +0100 Subject: [PATCH] --- yaml --- r: 41266 b: refs/heads/master c: b4ee4a2309c9f811457ce44962eed753e451dc11 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/net/net1080.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9b71d43a1e86..afe37cb7c2e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 692a186c9d5f12d43cef28d40c25247dc4f302f0 +refs/heads/master: b4ee4a2309c9f811457ce44962eed753e451dc11 diff --git a/trunk/drivers/usb/net/net1080.c b/trunk/drivers/usb/net/net1080.c index ce00de8f13a1..a77410562e12 100644 --- a/trunk/drivers/usb/net/net1080.c +++ b/trunk/drivers/usb/net/net1080.c @@ -237,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_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_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))