From: David S. Miller <davem@davemloft.net>
Date: Wed, 13 Apr 2011 02:27:51 +0000 (-0700)
Subject: net: Missing 'inline' in vlan-disabled vlan_untag()
X-Git-Tag: v3.0-rc1~377^2~436
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6139e75f4a413bdc8f366fc11e437347be8abc59;p=~shefty%2Frdma-dev.git

net: Missing 'inline' in vlan-disabled vlan_untag()

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index 998b29930b8..546d9d35fbd 100644
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
@@ -174,7 +174,7 @@ static inline bool vlan_do_receive(struct sk_buff **skb)
 	return false;
 }
 
-inline struct sk_buff *vlan_untag(struct sk_buff *skb)
+static inline struct sk_buff *vlan_untag(struct sk_buff *skb)
 {
 	return skb;
 }