Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[~andy/linux] / drivers / net / tun.c

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 09f66624eaca1eea40793f4c6c5c057f837a2e20..34cca74c99ed4f36060f1de55af2ffb523b67b0b 100644 (file)
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -364,7 +364,8 @@ static inline void tun_flow_save_rps_rxhash(struct tun_flow_entry *e, u32 hash)
  * different rxq no. here. If we could not get rxhash, then we would
  * hope the rxq no. may help here.
  */
-static u16 tun_select_queue(struct net_device *dev, struct sk_buff *skb)
+static u16 tun_select_queue(struct net_device *dev, struct sk_buff *skb,
+                           void *accel_priv)
 {
        struct tun_struct *tun = netdev_priv(dev);
        struct tun_flow_entry *e;