diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:13:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 18:13:09 -0800 |
| commit | 9102e0eb3e9e472dabe91d65783662d5619cf83b (patch) | |
| tree | 749e1f2ee74fdabdc3dbca665b3c2fcd024c90c0 /net/core/dev.c | |
| parent | d39a11f309a4fdeeed232dd6c0f00604d11a4aea (diff) | |
v2.4.3.4 -> v2.4.3.5
- Mike Phillips: olympic driver update
- Alan Cox: continued resyncing (lots of small stuff, big NTFS merge from Anton)
- Martin Dalecki: cleanup (remove unused and unnecessary get_hardblocksize)
- Chris Mason: fix potential reiserfs journal overflow
- Jeff Garzik: network driver updates
- David Miller: sparc fixes, some network cleanups
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 779e565c0da8..646044fda78e 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1363,7 +1363,7 @@ void net_call_rx_atomic(void (*fn)(void)) void (*br_handle_frame_hook)(struct sk_buff *skb) = NULL; #endif -static int __inline__ handle_bridge(struct sk_buff *skb, +static __inline__ int handle_bridge(struct sk_buff *skb, struct packet_type *pt_prev) { int ret = NET_RX_DROP; |