diff options
| author | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-12-03 20:11:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-12-03 20:11:49 -0800 |
| commit | 9b857a70be831cb0f0c768b0b1689de56d97175e (patch) | |
| tree | abfcad42a59ae380bc7cda39457a278b37d30c0d /include/linux | |
| parent | b60653b27c5f977bd53f95927776d88eadaf198f (diff) | |
| parent | 63c937c91ac0cc30116dfb5760ddcf9edf606ab4 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/crypto.h | 2 | ||||
| -rw-r--r-- | include/linux/mroute.h | 2 | ||||
| -rw-r--r-- | include/linux/netdevice.h | 11 |
3 files changed, 11 insertions, 4 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 960e54133e29..f82c74decefe 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -58,7 +58,6 @@ */ #define CRYPTO_UNSPEC 0 #define CRYPTO_MAX_ALG_NAME 64 -#define CRYPTO_MAX_CIPHER_BLOCK_SIZE 16 struct scatterlist; @@ -135,6 +134,7 @@ struct cipher_tfm { struct scatterlist *sg, unsigned int nsg); int (*cit_decrypt)(struct crypto_tfm *tfm, struct scatterlist *sg, unsigned int nsg); + void (*cit_xor_block)(u8 *dst, const u8 *src); }; struct digest_tfm { diff --git a/include/linux/mroute.h b/include/linux/mroute.h index e5b21ce0a07b..f568f979bbdf 100644 --- a/include/linux/mroute.h +++ b/include/linux/mroute.h @@ -126,6 +126,8 @@ struct igmpmsg */ #ifdef __KERNEL__ +#include <net/sock.h> + extern int ip_mroute_setsockopt(struct sock *, int, char *, int); extern int ip_mroute_getsockopt(struct sock *, int, char *, int *); extern int ipmr_ioctl(struct sock *sk, int cmd, unsigned long arg); diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index f2c8daf526aa..513b89ca7836 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -207,7 +207,8 @@ enum netdev_state_t __LINK_STATE_PRESENT, __LINK_STATE_SCHED, __LINK_STATE_NOCARRIER, - __LINK_STATE_RX_SCHED + __LINK_STATE_RX_SCHED, + __LINK_STATE_LINKWATCH_PENDING }; @@ -631,6 +632,8 @@ static inline void dev_put(struct net_device *dev) * who is responsible for serialization of these calls. */ +extern void linkwatch_fire_event(struct net_device *dev); + static inline int netif_carrier_ok(struct net_device *dev) { return !test_bit(__LINK_STATE_NOCARRIER, &dev->state); @@ -640,14 +643,16 @@ extern void __netdev_watchdog_up(struct net_device *dev); static inline void netif_carrier_on(struct net_device *dev) { - clear_bit(__LINK_STATE_NOCARRIER, &dev->state); + if (test_and_clear_bit(__LINK_STATE_NOCARRIER, &dev->state)) + linkwatch_fire_event(dev); if (netif_running(dev)) __netdev_watchdog_up(dev); } static inline void netif_carrier_off(struct net_device *dev) { - set_bit(__LINK_STATE_NOCARRIER, &dev->state); + if (!test_and_set_bit(__LINK_STATE_NOCARRIER, &dev->state)) + linkwatch_fire_event(dev); } /* Hot-plugging. */ |