diff --git a/[refs] b/[refs] index 08a7d15e7f8a..a0e6e33391f1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 954b1244530064d48dde133f906026e56ba0ae56 +refs/heads/master: 7e307c67c94619fa53b22735673fbf99b427e760 diff --git a/trunk/net/802/mrp.c b/trunk/net/802/mrp.c index 47a9e14c8ba7..a4cc3229952a 100644 --- a/trunk/net/802/mrp.c +++ b/trunk/net/802/mrp.c @@ -744,8 +744,8 @@ static int mrp_pdu_parse_msg(struct mrp_applicant *app, struct sk_buff *skb, return 0; } -int mrp_rcv(struct sk_buff *skb, struct net_device *dev, - struct packet_type *pt, struct net_device *orig_dev) +static int mrp_rcv(struct sk_buff *skb, struct net_device *dev, + struct packet_type *pt, struct net_device *orig_dev) { struct mrp_application *appl = container_of(pt, struct mrp_application, pkttype);