From: Priit Laes Date: Sat, 1 Sep 2012 09:06:01 +0000 (+0300) Subject: staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.32 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=99b2c9d77eaa1f9a52cad4432631c9e7a741ac6b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git staging: csr: netdev.c: Clean up KERNEL_VERSION checks: 2.6.32 Signed-off-by: Priit Laes Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c index 8b4628045c1e..371e0a0ea587 100644 --- a/drivers/staging/csr/netdev.c +++ b/drivers/staging/csr/netdev.c @@ -100,17 +100,7 @@ static int uf_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); static int uf_net_stop(struct net_device *dev); static struct net_device_stats *uf_net_get_stats(struct net_device *dev); static u16 uf_net_select_queue(struct net_device *dev, struct sk_buff *skb); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) static netdev_tx_t uf_net_xmit(struct sk_buff *skb, struct net_device *dev); -#else -static int uf_net_xmit(struct sk_buff *skb, struct net_device *dev); -#ifndef NETDEV_TX_OK -#define NETDEV_TX_OK 0 -#endif -#ifndef NETDEV_TX_BUSY -#define NETDEV_TX_BUSY 1 -#endif -#endif static void uf_set_multicast_list(struct net_device *dev); @@ -1792,11 +1782,7 @@ send_ma_pkt_request(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr * The controlled port is handled in the qdisc dequeue handler. * --------------------------------------------------------------------------- */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32) static netdev_tx_t -#else -static int -#endif uf_net_xmit(struct sk_buff *skb, struct net_device *dev) { netInterface_priv_t *interfacePriv = (netInterface_priv_t *)netdev_priv(dev);