* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (30 commits) e1000: fix virtualization bug bonding: fix alb mode locking regression Bluetooth: Fix issue with sysfs handling for connections usbnet: CDC EEM support (v5) tcp: Fix tcp_prequeue() to get correct rto_min value ehea: fix invalid pointer access ne2k-pci: Do not register device until initialized. Subject: [PATCH] br2684: restore net_dev initialization net: Only store high 16 bits of kernel generated filter priorities virtio_net: Fix function name typo virtio_net: Cleanup command queue scatterlist usage bonding: correct the cleanup in bond_create() virtio: add missing include to virtio_net.h smsc95xx: add support for LAN9512 and LAN9514 smsc95xx: configure LED outputs netconsole: take care of NETDEV_UNREGISTER event xt_socket: checks for the state of nf_conntrack bonding: bond_slave_info_query() fix cxgb3: fixing gcc 4.4 compiler warning: suggest parentheses around operand of ‘!’ netfilter: use likely() in xt_info_rdlock_bh() ...
Showing the changes to include/linux (3 of 33 files). Show all
Unified · Split
| @@ -472,7 +472,7 @@ static inline void xt_info_rdlock_bh(void) · 471 unmodified lines | ||
| 472 | 472 | |
| 473 | 473 | local_bh_disable(); |
| 474 | 474 | lock = &__get_cpu_var(xt_info_locks); |
| 475 | − if (!lock->readers++) | |
| 475 | + if (likely(!lock->readers++)) | |
| 476 | 476 | spin_lock(&lock->lock); |
| 477 | 477 | } |
| 478 | 478 | |
| @@ -480,7 +480,7 @@ static inline void xt_info_rdunlock_bh(void) · 1 unmodified line | ||
| 480 | 480 | { |
| 481 | 481 | struct xt_info_lock *lock = &__get_cpu_var(xt_info_locks); |
| 482 | 482 | |
| 483 | − if (!--lock->readers) | |
| 483 | + if (likely(!--lock->readers)) | |
| 484 | 484 | spin_unlock(&lock->lock); |
| 485 | 485 | local_bh_enable(); |
| 486 | 486 | } |
| @@ -17,6 +17,7 @@ · 16 unmodified lines | ||
| 17 | 17 | #define USB_CDC_SUBCLASS_DMM 0x09 |
| 18 | 18 | #define USB_CDC_SUBCLASS_MDLM 0x0a |
| 19 | 19 | #define USB_CDC_SUBCLASS_OBEX 0x0b |
| 20 | +#define USB_CDC_SUBCLASS_EEM 0x0c | |
| 20 | 21 | |
| 21 | 22 | #define USB_CDC_PROTO_NONE 0 |
| 22 | 23 | |
| @@ -28,6 +29,8 @@ · 5 unmodified lines | ||
| 28 | 29 | #define USB_CDC_ACM_PROTO_AT_CDMA 6 |
| 29 | 30 | #define USB_CDC_ACM_PROTO_VENDOR 0xff |
| 30 | 31 | |
| 32 | +#define USB_CDC_PROTO_EEM 7 | |
| 33 | + | |
| 31 | 34 | /*-------------------------------------------------------------------------*/ |
| 32 | 35 | |
| 33 | 36 | /* |
| @@ -4,6 +4,7 @@ · 3 unmodified lines | ||
| 4 | 4 | * compatible drivers/servers. */ |
| 5 | 5 | #include <linux/types.h> |
| 6 | 6 | #include <linux/virtio_config.h> |
| 7 | +#include <linux/if_ether.h> | |
| 7 | 8 | |
| 8 | 9 | /* The ID for virtio_net */ |
| 9 | 10 | #define VIRTIO_ID_NET 1 |