diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-12 19:27:51 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-12 19:27:51 -0700 |
| commit | 6139e75f4a413bdc8f366fc11e437347be8abc59 (patch) | |
| tree | 3cc9d95c92840717e2ecbd88c4d1ce35b339057c /include | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
| download | linux-6139e75f4a413bdc8f366fc11e437347be8abc59.tar.gz linux-6139e75f4a413bdc8f366fc11e437347be8abc59.zip | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_vlan.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 998b29930b80..546d9d35fbd4 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; } |