projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Fix build on RHEL 5.5
[openvswitch]
/
datapath
/
linux
/
compat
/
include
/
linux
/
netdevice.h
diff --git
a/datapath/linux/compat/include/linux/netdevice.h
b/datapath/linux/compat/include/linux/netdevice.h
index 8d24cd969c809b2df69c1eb1dd70efb93f9f65ea..0c2f2f4c7c799d4658b366c1113ada512823eeac 100644
(file)
--- a/
datapath/linux/compat/include/linux/netdevice.h
+++ b/
datapath/linux/compat/include/linux/netdevice.h
@@
-60,11
+60,11
@@
typedef int netdev_tx_t;
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
/* Linux 2.6.24 added a network namespace pointer to the macro. */
#undef for_each_netdev
#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
/* Linux 2.6.24 added a network namespace pointer to the macro. */
#undef for_each_netdev
-#define for_each_netdev(net,d) list_for_each_entry(d, &dev_base_head, dev_list)
+#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)
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20)
-#define net_xmit_eval(e) ((e) == NET_XMIT_CN? 0 : (e))
+#define net_xmit_eval(e) ((e) == NET_XMIT_CN
? 0 : (e))
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33)
@@
-100,7
+100,7
@@
static inline void netdev_rx_handler_unregister(struct net_device *dev)
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
#undef SET_ETHTOOL_OPS
#define SET_ETHTOOL_OPS(netdev, ops) \
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
#undef SET_ETHTOOL_OPS
#define SET_ETHTOOL_OPS(netdev, ops) \
- (
(netdev)->ethtool_ops = (struct ethtool_ops *)(ops)
)
+ (
(netdev)->ethtool_ops = (struct ethtool_ops *)(ops)
)
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
@@
-149,8
+149,8
@@
u32 rpl_netif_skb_features(struct sk_buff *skb);
#define netif_needs_gso rpl_netif_needs_gso
static inline int rpl_netif_needs_gso(struct sk_buff *skb, int features)
{
#define netif_needs_gso rpl_netif_needs_gso
static inline int rpl_netif_needs_gso(struct sk_buff *skb, int features)
{
-
return skb_is_gso(skb) && (!skb_gso_ok(skb, features) ||
-
unlikely(skb->ip_summed != CHECKSUM_PARTIAL));
+ return skb_is_gso(skb) && (!skb_gso_ok(skb, features) ||
+ unlikely(skb->ip_summed != CHECKSUM_PARTIAL));
}
#endif
}
#endif