diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2003-12-29 21:27:12 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2003-12-29 21:27:12 -0800 |
| commit | 19774a6dc654c1e197e0a8d7976067f64eff8643 (patch) | |
| tree | 1726a251ce9af603341710fed5fdc20cdf765f0e /include | |
| parent | 313c01d3e3fdc0c780e0445a6019e44edba5420c (diff) | |
| parent | 0b38c67667bb2163c910c897faa2d3e535e7a63b (diff) | |
Merge nuts.ninka.net:/disk1/davem/BK/network-2.6
into nuts.ninka.net:/disk1/davem/BK/net-2.6
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netfilter_bridge.h | 5 | ||||
| -rw-r--r-- | include/net/sctp/sctp.h | 1 | ||||
| -rw-r--r-- | include/net/xfrm.h | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h index 88cc98af2dce..a6531bb097ca 100644 --- a/include/linux/netfilter_bridge.h +++ b/include/linux/netfilter_bridge.h @@ -71,12 +71,10 @@ static inline void nf_bridge_maybe_copy_header(struct sk_buff *skb) { if (skb->nf_bridge) { -#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) if (skb->protocol == __constant_htons(ETH_P_8021Q)) { memcpy(skb->data - 18, skb->nf_bridge->hh, 18); skb_push(skb, 4); } else -#endif memcpy(skb->data - 16, skb->nf_bridge->hh, 16); } } @@ -86,10 +84,9 @@ void nf_bridge_save_header(struct sk_buff *skb) { int header_size = 16; -#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) if (skb->protocol == __constant_htons(ETH_P_8021Q)) header_size = 18; -#endif + memcpy(skb->nf_bridge->hh, skb->data - header_size, header_size); } diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index bf33562cd101..7edb15d6561a 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h @@ -90,7 +90,6 @@ #include <net/snmp.h> #include <net/sctp/structs.h> #include <net/sctp/constants.h> -#include <net/sctp/sm.h> /* Set SCTP_DEBUG flag via config if not already set. */ diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 2ae391720d4d..67072071aec1 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -860,7 +860,7 @@ extern void xfrm_policy_flush(void); extern void xfrm_policy_kill(struct xfrm_policy *); extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol); extern struct xfrm_policy *xfrm_sk_policy_lookup(struct sock *sk, int dir, struct flowi *fl); -extern int xfrm_flush_bundles(struct xfrm_state *x); +extern int xfrm_flush_bundles(void); extern wait_queue_head_t km_waitq; extern void km_state_expired(struct xfrm_state *x, int hard); |