diff options
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/xen-netback/interface.c | 4 | ||||
| -rw-r--r-- | drivers/net/xen-netback/netback.c | 4 | 
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index 78ebe494fef0..92274c237200 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -148,14 +148,14 @@ void xenvif_wake_queue(struct xenvif_queue *queue)  }  static u16 xenvif_select_queue(struct net_device *dev, struct sk_buff *skb, -			       void *accel_priv, +			       struct net_device *sb_dev,  			       select_queue_fallback_t fallback)  {  	struct xenvif *vif = netdev_priv(dev);  	unsigned int size = vif->hash.size;  	if (vif->hash.alg == XEN_NETIF_CTRL_HASH_ALGORITHM_NONE) -		return fallback(dev, skb) % dev->real_num_tx_queues; +		return fallback(dev, skb, NULL) % dev->real_num_tx_queues;  	xenvif_set_skb_hash(vif, skb); diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index a27daa23c9dc..3621e05a7494 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -1603,9 +1603,9 @@ static void xenvif_ctrl_action(struct xenvif *vif)  static bool xenvif_ctrl_work_todo(struct xenvif *vif)  {  	if (likely(RING_HAS_UNCONSUMED_REQUESTS(&vif->ctrl))) -		return 1; +		return true; -	return 0; +	return false;  }  irqreturn_t xenvif_ctrl_irq_fn(int irq, void *data)  | 
