diff --git a/[refs] b/[refs] index c1651856fc3c..f67a6d6992e7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3400112794724d9bdc3de6e1ce1475b726e6ca7d +refs/heads/master: b3e83d6d187664be56a1591ccfa99124b88f0582 diff --git a/trunk/net/bridge/br_input.c b/trunk/net/bridge/br_input.c index a9feb2015425..b7766562d72c 100644 --- a/trunk/net/bridge/br_input.c +++ b/trunk/net/bridge/br_input.c @@ -109,7 +109,7 @@ static int br_handle_local_finish(struct sk_buff *skb) /* Does address match the link local multicast address. * 01:80:c2:00:00:0X */ -static inline int is_link_local(const const unsigned char *dest) +static inline int is_link_local(const unsigned char *dest) { return memcmp(dest, br_group_address, 5) == 0 && (dest[5] & 0xf0) == 0; }