diff --git a/[refs] b/[refs] index 5e0398da06ce..aa1591d7bb82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9070683bdac59a3b26e2ce6dd0d05fbfcb3fc7d8 +refs/heads/master: 33d043d65bbd3d97efca96c9bbada443cac3c4da diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c index 19f24f778dc8..3f1a263e1249 100644 --- a/trunk/net/ipv4/ip_output.c +++ b/trunk/net/ipv4/ip_output.c @@ -200,7 +200,7 @@ static inline int ip_finish_output2(struct sk_buff *skb) return -EINVAL; } -static int ip_finish_output(struct sk_buff *skb) +static inline int ip_finish_output(struct sk_buff *skb) { struct net_device *dev = skb->dst->dev;