diff --git a/[refs] b/[refs] index f0143a4f6293..e401b8c7acf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ece367d53a5bf46cc357163c7074a6546a0ec01c +refs/heads/master: 2df1fe7f1006f3c1d9ecbe9311701833c63c14cc diff --git a/trunk/drivers/net/caif/caif_hsi.c b/trunk/drivers/net/caif/caif_hsi.c index 9849a238d54a..42539919db17 100644 --- a/trunk/drivers/net/caif/caif_hsi.c +++ b/trunk/drivers/net/caif/caif_hsi.c @@ -1129,15 +1129,11 @@ static int cfhsi_xmit(struct sk_buff *skb, struct net_device *dev) static int cfhsi_open(struct net_device *dev) { - netif_wake_queue(dev); - return 0; } static int cfhsi_close(struct net_device *dev) { - netif_stop_queue(dev); - return 0; } @@ -1319,9 +1315,6 @@ int cfhsi_probe(struct platform_device *pdev) __func__, res); goto err_net_reg; } - - netif_stop_queue(ndev); - return res; err_net_reg: @@ -1344,9 +1337,6 @@ static void cfhsi_shutdown(struct cfhsi *cfhsi) { u8 *tx_buf, *rx_buf, *flip_buf; - /* Stop TXing */ - netif_tx_stop_all_queues(cfhsi->ndev); - /* going to shutdown driver */ set_bit(CFHSI_SHUTDOWN, &cfhsi->bits);