From 4e4b992ad82ea140f918131e3a730c0a6ac07bb1 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 24 Nov 2009 00:47:29 +0000 Subject: [PATCH] fix some openswan netdev_ops thinkos (#6183) SVN-Revision: 18519 --- net/openswan/patches/130-netdev_ops.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/openswan/patches/130-netdev_ops.patch b/net/openswan/patches/130-netdev_ops.patch index 830804e4d..9ea2f38f5 100644 --- a/net/openswan/patches/130-netdev_ops.patch +++ b/net/openswan/patches/130-netdev_ops.patch @@ -101,7 +101,7 @@ diff -urN openswan-2.6.23/linux/net/ipsec/ipsec_rcv.c openswan-2.6.23.new/linux/ if(skb->dev && skb->dev->get_stats) { struct net_device_stats *stats = skb->dev->get_stats(skb->dev); +#else -+#if !(defined CONFIG_COMPAT_NET_DEV_OPS) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) ++#if !(defined CONFIG_COMPAT_NET_DEV_OPS) || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) + if(skb->dev && skb->dev->netdev_ops->ndo_get_stats) { + struct net_device_stats *stats = skb->dev->netdev_ops->ndo_get_stats(skb->dev); +#endif @@ -125,7 +125,7 @@ diff -urN openswan-2.6.23/linux/net/ipsec/ipsec_tunnel.c openswan-2.6.23.new/lin { int i; struct ipsecpriv *prv = netdev_priv(dev); -+#if !(defined CONFIG_COMPAT_NET_DEV_OPS) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) ++#if !(defined CONFIG_COMPAT_NET_DEV_OPS) || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) + struct net_device_ops *dev_ops; + struct net_device_ops *physdev_ops; +#endif @@ -143,7 +143,7 @@ diff -urN openswan-2.6.23/linux/net/ipsec/ipsec_tunnel.c openswan-2.6.23.new/lin prv->hard_start_xmit = physdev->hard_start_xmit; prv->get_stats = physdev->get_stats; +#else -+#if !(defined CONFIG_COMPAT_NET_DEV_OPS) && LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) ++#if !(defined CONFIG_COMPAT_NET_DEV_OPS) || LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,30) + dev_ops = (struct net_device_ops *)dev->netdev_ops; + dev_ops->ndo_set_mac_address = ipsec_tunnel_set_mac_address; +#endif -- 2.30.2