OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[android-x86/kernel.git]
/
net
/
8021q
/
vlan.h
diff --git
a/net/8021q/vlan.h
b/net/8021q/vlan.h
index
c3408de
..
9da07e3
100644
(file)
--- a/
net/8021q/vlan.h
+++ b/
net/8021q/vlan.h
@@
-118,11
+118,6
@@
extern void vlan_netlink_fini(void);
extern struct rtnl_link_ops vlan_link_ops;
-static inline int is_vlan_dev(struct net_device *dev)
-{
- return dev->priv_flags & IFF_802_1Q_VLAN;
-}
-
extern int vlan_net_id;
struct proc_dir_entry;