diff --git a/[refs] b/[refs] index 9630020761d7..1f5c7c08ae6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5933dd2f028cdcbb4b3169dca594324704ba10ae +refs/heads/master: 9f70b0fcecd134890affe627aa2823591313a413 diff --git a/trunk/net/bridge/br_private.h b/trunk/net/bridge/br_private.h index f6bc979b1135..07cf57b373fe 100644 --- a/trunk/net/bridge/br_private.h +++ b/trunk/net/bridge/br_private.h @@ -305,7 +305,7 @@ static inline struct netpoll_info *br_netpoll_info(struct net_bridge *br) return NULL; } -static inline void br_netpoll_send_skb(struct net_bridge_port *p, +static inline void br_netpoll_send_skb(const struct net_bridge_port *p, struct sk_buff *skb) { }