diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-11 18:43:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-11 18:43:03 -0500 |
| commit | 60dbb011df9764294284cc3e70f935eaa462e15e (patch) | |
| tree | 7bf7672001c3fc87850895577f22c0f6dc4c1138 /include/linux/if_bridge.h | |
| parent | 4b0ef1f223be4e092632b4152ceec5627ac10f59 (diff) | |
| parent | 2f46e07995734a363608e974a82fd05d5b610750 (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/net-2.6
Diffstat (limited to 'include/linux/if_bridge.h')
| -rw-r--r-- | include/linux/if_bridge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index f7e73c338c40..dd3f20139640 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h | |||
| @@ -103,7 +103,7 @@ struct __fdb_entry { | |||
| 103 | 103 | ||
| 104 | extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *)); | 104 | extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *)); |
| 105 | 105 | ||
| 106 | typedef int (*br_should_route_hook_t)(struct sk_buff *skb); | 106 | typedef int br_should_route_hook_t(struct sk_buff *skb); |
| 107 | extern br_should_route_hook_t __rcu *br_should_route_hook; | 107 | extern br_should_route_hook_t __rcu *br_should_route_hook; |
| 108 | 108 | ||
| 109 | #endif | 109 | #endif |