Commit dfb9c436 authored by Linus Torvalds's avatar Linus Torvalds

Merge master.kernel.org:/home/davem/BK/net-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 299b664a 987793dc
...@@ -370,7 +370,7 @@ static void tx_dma_buf_check(pc300_t * card, int ch) ...@@ -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 first_bd = card->chan[ch].tx_first_bd;
ucshort next_bd = card->chan[ch].tx_next_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), first_bd, TX_BD_ADDR(ch, first_bd),
next_bd, TX_BD_ADDR(ch, next_bd)); next_bd, TX_BD_ADDR(ch, next_bd));
for (i = first_bd, for (i = first_bd,
......
...@@ -181,7 +181,7 @@ struct sadb_x_policy { ...@@ -181,7 +181,7 @@ struct sadb_x_policy {
uint8_t sadb_x_policy_dir; uint8_t sadb_x_policy_dir;
uint8_t sadb_x_policy_reserved; uint8_t sadb_x_policy_reserved;
uint32_t sadb_x_policy_id; uint32_t sadb_x_policy_id;
uint32_t sadb_x_policy_reserved2; uint32_t sadb_x_policy_priority;
} __attribute__((packed)); } __attribute__((packed));
/* sizeof(struct sadb_x_policy) == 16 */ /* sizeof(struct sadb_x_policy) == 16 */
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#if defined (CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE) #if defined (CONFIG_BRIDGE) || defined(CONFIG_BRIDGE_MODULE)
#include <linux/if_bridge.h> #include <linux/if_bridge.h>
struct net_bridge;
extern struct net_bridge_fdb_entry *(*br_fdb_get_hook)(struct net_bridge *br, extern struct net_bridge_fdb_entry *(*br_fdb_get_hook)(struct net_bridge *br,
unsigned char *addr); unsigned char *addr);
extern void (*br_fdb_put_hook)(struct net_bridge_fdb_entry *ent); extern void (*br_fdb_put_hook)(struct net_bridge_fdb_entry *ent);
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# #
menu "IPv6: Netfilter Configuration" 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 #tristate 'Connection tracking (required for masq/NAT)' CONFIG_IP6_NF_CONNTRACK
#if [ "$CONFIG_IP6_NF_CONNTRACK" != "n" ]; then #if [ "$CONFIG_IP6_NF_CONNTRACK" != "n" ]; then
......
...@@ -1780,6 +1780,7 @@ static void pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, i ...@@ -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_dir = dir+1;
pol->sadb_x_policy_id = xp->index; pol->sadb_x_policy_id = xp->index;
pol->sadb_x_policy_priority = xp->priority;
for (i=0; i<xp->xfrm_nr; i++) { for (i=0; i<xp->xfrm_nr; i++) {
struct sadb_x_ipsecrequest *rq; struct sadb_x_ipsecrequest *rq;
...@@ -1872,6 +1873,7 @@ static int pfkey_spdadd(struct sock *sk, struct sk_buff *skb, struct sadb_msg *h ...@@ -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 ? xp->action = (pol->sadb_x_policy_type == IPSEC_POLICY_DISCARD ?
XFRM_POLICY_BLOCK : XFRM_POLICY_ALLOW); XFRM_POLICY_BLOCK : XFRM_POLICY_ALLOW);
xp->priority = pol->sadb_x_policy_priority;
sa = ext_hdrs[SADB_EXT_ADDRESS_SRC-1], sa = ext_hdrs[SADB_EXT_ADDRESS_SRC-1],
xp->family = pfkey_sadb_addr2xfrm_addr(sa, &xp->selector.saddr); xp->family = pfkey_sadb_addr2xfrm_addr(sa, &xp->selector.saddr);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment