projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "master" into "next".
[openvswitch]
/
datapath
/
linux-2.6
/
compat-2.6
/
include
/
linux
/
netdevice.h
diff --git
a/datapath/linux-2.6/compat-2.6/include/linux/netdevice.h
b/datapath/linux-2.6/compat-2.6/include/linux/netdevice.h
index c25f2bd04ae1ea91766c4c846ecc098f34c01b26..0cd91b9f4bc18fa3437065fd7d599ecd30919ff0 100644
(file)
--- a/
datapath/linux-2.6/compat-2.6/include/linux/netdevice.h
+++ b/
datapath/linux-2.6/compat-2.6/include/linux/netdevice.h
@@
-63,6
+63,14
@@
typedef int netdev_tx_t;
#define for_each_netdev(net,d) list_for_each_entry(d, &dev_base_head, dev_list)
#endif
#define for_each_netdev(net,d) list_for_each_entry(d, &dev_base_head, dev_list)
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
+#define net_xmit_eval(e) ((e) == NET_XMIT_CN? 0 : (e))
+#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
+extern void unregister_netdevice_queue(struct net_device *dev,
+ struct list_head *head);
+extern void unregister_netdevice_many(struct list_head *head);
+#endif
#endif
#endif