diff options
| author |   David S. Miller <davem@davemloft.net> | 2009-05-03 14:07:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-03 14:07:43 -0700 |
| commit | d252a5e7b73026b3ba3c49940724292099e634f0 (patch) | |
| tree | c151797f0daecf457ef7a4bad027ecfdd8d79ad6 /include | |
| parent | 3c589_cs: add cis(firmware) of 3Com multifunction pcmcia card (diff) | |
| parent | virtio_net: Fix function name typo (diff) | |
| download | linux-dev-d252a5e7b73026b3ba3c49940724292099e634f0.tar.xz linux-dev-d252a5e7b73026b3ba3c49940724292099e634f0.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter/x_tables.h | 4 | ||||
| -rw-r--r-- | include/linux/virtio_net.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h index 1b2e43502ef7..c9efe039dc57 100644 --- a/include/linux/netfilter/x_tables.h +++ b/include/linux/netfilter/x_tables.h @@ -472,7 +472,7 @@ static inline void xt_info_rdlock_bh(void) local_bh_disable(); lock = &__get_cpu_var(xt_info_locks); - if (!lock->readers++) + if (likely(!lock->readers++)) spin_lock(&lock->lock); } @@ -480,7 +480,7 @@ static inline void xt_info_rdunlock_bh(void) { struct xt_info_lock *lock = &__get_cpu_var(xt_info_locks); - if (!--lock->readers) + if (likely(!--lock->readers)) spin_unlock(&lock->lock); local_bh_enable(); } diff --git a/include/linux/virtio_net.h b/include/linux/virtio_net.h index 242348bb3766..cec79adbe3ea 100644 --- a/include/linux/virtio_net.h +++ b/include/linux/virtio_net.h @@ -4,6 +4,7 @@ * compatible drivers/servers. */ #include <linux/types.h> #include <linux/virtio_config.h> +#include <linux/if_ether.h> /* The ID for virtio_net */ #define VIRTIO_ID_NET 1 |