backports: remove useless netdev_tx_t patch
authorJohannes Berg <johannes.berg@intel.com>
Mon, 15 Apr 2013 20:23:45 +0000 (22:23 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 15 Apr 2013 20:23:45 +0000 (22:23 +0200)
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 <johannes.berg@intel.com>
patches/collateral-evolutions/network/0002-net-misc/bluetooth_bnep.patch [deleted file]

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 (file)
index 4bebe22..0000000
+++ /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;