| commit | 6139e75f4a413bdc8f366fc11e437347be8abc59 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Tue Apr 12 19:27:51 2011 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Tue Apr 12 19:27:51 2011 -0700 |
| tree | 3cc9d95c92840717e2ecbd88c4d1ce35b339057c | |
| parent | a7e70158884629898d79709622a66b8ef99e4018 [diff] |
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 998b299..546d9d3 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h
@@ -174,7 +174,7 @@ 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; }