diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-18 23:57:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-04-18 23:57:11 -0700 |
| commit | dfb9c436d78ca78c7c3fdc879e4c4691e19e95d1 (patch) | |
| tree | 8e0ed679ef6f47a14e83d1b69cd137d9935e5bdf | |
| parent | 299b664abcaf14bcc83d06a31cb2d0061ab1d69a (diff) | |
| parent | 987793dcac3ab8dfa05924a5baf42d4fcbf87668 (diff) | |
Merge master.kernel.org:/home/davem/BK/net-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
| -rw-r--r-- | drivers/net/wan/pc300_drv.c | 2 | ||||
| -rw-r--r-- | include/linux/pfkeyv2.h | 2 | ||||
| -rw-r--r-- | net/atm/lec.h | 1 | ||||
| -rw-r--r-- | net/ipv6/netfilter/Kconfig | 2 | ||||
| -rw-r--r-- | net/key/af_key.c | 2 |
5 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index cb40628fa62c..05aa310d3610 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c @@ -370,7 +370,7 @@ static void tx_dma_buf_check(pc300_t * card, int ch) ucshort first_bd = card->chan[ch].tx_first_bd; ucshort next_bd = card->chan[ch].tx_next_bd; - printk("#CH%d: f_bd = %d(0x%08x), n_bd = %d(0x%08x)\n", ch, + printk("#CH%d: f_bd = %d(0x%08zx), n_bd = %d(0x%08zx)\n", ch, first_bd, TX_BD_ADDR(ch, first_bd), next_bd, TX_BD_ADDR(ch, next_bd)); for (i = first_bd, diff --git a/include/linux/pfkeyv2.h b/include/linux/pfkeyv2.h index 81807d58bb3e..a48a3ecc7c21 100644 --- a/include/linux/pfkeyv2.h +++ b/include/linux/pfkeyv2.h @@ -181,7 +181,7 @@ struct sadb_x_policy { uint8_t sadb_x_policy_dir; uint8_t sadb_x_policy_reserved; uint32_t sadb_x_policy_id; - uint32_t sadb_x_policy_reserved2; + uint32_t sadb_x_policy_priority; } __attribute__((packed)); /* sizeof(struct sadb_x_policy) == 16 */ diff --git a/net/atm/lec.h b/net/atm/lec.h index e9381d93384b..673bd7881318 100644 --- a/net/atm/lec.h +++ b/net/atm/lec.h @@ -16,6 +16,7 @@ #if defined (CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) #include <linux/if_bridge.h> +struct net_bridge; extern struct net_bridge_fdb_entry *(*br_fdb_get_hook)(struct net_bridge *br, unsigned char *addr); extern void (*br_fdb_put_hook)(struct net_bridge_fdb_entry *ent); diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index 2c14441a2b94..0e212f21eabe 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig @@ -3,7 +3,7 @@ # menu "IPv6: Netfilter Configuration" - depends on INET && IPV6!=n && NETFILTER + depends on INET && IPV6 && NETFILTER #tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP6_NF_CONNTRACK #if [ "$CONFIG_IP6_NF_CONNTRACK" != "n" ]; then diff --git a/net/key/af_key.c b/net/key/af_key.c index 6ce0dc19f332..6f360a610250 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -1780,6 +1780,7 @@ static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, i } pol->sadb_x_policy_dir = dir+1; pol->sadb_x_policy_id = xp->index; + pol->sadb_x_policy_priority = xp->priority; for (i=0; i<xp->xfrm_nr; i++) { struct sadb_x_ipsecrequest *rq; @@ -1872,6 +1873,7 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h xp->action = (pol->sadb_x_policy_type == IPSEC_POLICY_DISCARD ? XFRM_POLICY_BLOCK : XFRM_POLICY_ALLOW); + xp->priority = pol->sadb_x_policy_priority; sa = ext_hdrs[SADB_EXT_ADDRESS_SRC-1], xp->family = pfkey_sadb_addr2xfrm_addr(sa, &xp->selector.saddr); |