From ada6f3f546bcb93735002a5fdd234b146dab3e50 Mon Sep 17 00:00:00 2001 From: Bart De Schuymer Date: Wed, 18 Sep 2002 16:24:33 +0000 Subject: *** empty log message *** --- br-nf-bds/linux/include/linux/skbuff.h | 18 +++++++++--------- br-nf-bds/linux/net/bridge/Makefile | 4 ---- 2 files changed, 9 insertions(+), 13 deletions(-) (limited to 'br-nf-bds/linux') diff --git a/br-nf-bds/linux/include/linux/skbuff.h b/br-nf-bds/linux/include/linux/skbuff.h index 257b586..4bc7c3f 100644 --- a/br-nf-bds/linux/include/linux/skbuff.h +++ b/br-nf-bds/linux/include/linux/skbuff.h @@ -135,8 +135,8 @@ struct sk_buff { struct sock *sk; /* Socket we are owned by */ struct timeval stamp; /* Time we arrived */ struct net_device *dev; /* Device we arrived on/are leaving by */ - struct net_device *physindev; /* Physical device we arrived on */ - struct net_device *physoutdev; /* Physical device we will leave by */ + struct net_device *physindev; /* Physical device we arrived on */ + struct net_device *physoutdev; /* Physical device we will leave by */ /* Transport layer header */ union @@ -590,7 +590,7 @@ static inline struct sk_buff *__skb_dequeue(struct sk_buff_head *list) static inline struct sk_buff *skb_dequeue(struct sk_buff_head *list) { - long flags; + unsigned long flags; struct sk_buff *result; spin_lock_irqsave(&list->lock, flags); @@ -739,7 +739,7 @@ static inline struct sk_buff *__skb_dequeue_tail(struct sk_buff_head *list) static inline struct sk_buff *skb_dequeue_tail(struct sk_buff_head *list) { - long flags; + unsigned long flags; struct sk_buff *result; spin_lock_irqsave(&list->lock, flags); @@ -758,9 +758,9 @@ static inline int skb_headlen(const struct sk_buff *skb) return skb->len - skb->data_len; } -#define SKB_PAGE_ASSERT(skb) do { if (skb_shinfo(skb)->nr_frags) BUG(); } while (0) -#define SKB_FRAG_ASSERT(skb) do { if (skb_shinfo(skb)->frag_list) BUG(); } while (0) -#define SKB_LINEAR_ASSERT(skb) do { if (skb_is_nonlinear(skb)) BUG(); } while (0) +#define SKB_PAGE_ASSERT(skb) do { if (skb_shinfo(skb)->nr_frags) out_of_line_bug(); } while (0) +#define SKB_FRAG_ASSERT(skb) do { if (skb_shinfo(skb)->frag_list) out_of_line_bug(); } while (0) +#define SKB_LINEAR_ASSERT(skb) do { if (skb_is_nonlinear(skb)) out_of_line_bug(); } while (0) /* * Add data to an sk_buff @@ -828,7 +828,7 @@ static inline char *__skb_pull(struct sk_buff *skb, unsigned int len) { skb->len-=len; if (skb->len < skb->data_len) - BUG(); + out_of_line_bug(); return skb->data+=len; } @@ -1096,7 +1096,7 @@ static inline void *kmap_skb_frag(const skb_frag_t *frag) { #ifdef CONFIG_HIGHMEM if (in_irq()) - BUG(); + out_of_line_bug(); local_bh_disable(); #endif diff --git a/br-nf-bds/linux/net/bridge/Makefile b/br-nf-bds/linux/net/bridge/Makefile index 8cb6869..cbeca2a 100644 --- a/br-nf-bds/linux/net/bridge/Makefile +++ b/br-nf-bds/linux/net/bridge/Makefile @@ -7,11 +7,7 @@ # # Note 2! The CFLAGS definition is now in the main makefile... -ifneq ($(CONFIG_BRIDGE_EBT_BROUTE),n) -ifneq ($(CONFIG_BRIDGE_EBT_BROUTE),) export-objs := br.o -endif -endif O_TARGET := bridge.o obj-y := br.o br_device.o br_fdb.o br_forward.o br_if.o br_input.o \ -- cgit v1.2.3