From 86cf71b5e0a1b7a9e9be998adf86b4b1cfa9dbac Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 15 Apr 2013 22:23:45 +0200 Subject: [PATCH] backports: remove useless netdev_tx_t patch The type netdev_tx_t already gets a typedef to int on old kernels, so the ifdef in bluetooth code isn't necessary. Signed-off-by: Johannes Berg --- .../network/0002-net-misc/bluetooth_bnep.patch | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 patches/collateral-evolutions/network/0002-net-misc/bluetooth_bnep.patch diff --git a/patches/collateral-evolutions/network/0002-net-misc/bluetooth_bnep.patch b/patches/collateral-evolutions/network/0002-net-misc/bluetooth_bnep.patch deleted file mode 100644 index 4bebe22e96eb..000000000000 --- a/patches/collateral-evolutions/network/0002-net-misc/bluetooth_bnep.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/net/bluetooth/bnep/netdev.c -+++ b/net/bluetooth/bnep/netdev.c -@@ -161,8 +161,12 @@ static int bnep_net_proto_filter(struct - } - #endif - -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31)) - static netdev_tx_t bnep_net_xmit(struct sk_buff *skb, - struct net_device *dev) -+#else -+static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev) -+#endif - { - struct bnep_session *s = netdev_priv(dev); - struct sock *sk = s->sock->sk; -- 2.30.2