From fa7e4667e840b24dbd496d27cf2a52907c22aee2 Mon Sep 17 00:00:00 2001 From: Ivan Vecera Date: Thu, 8 Dec 2011 01:31:21 +0000 Subject: [PATCH] --- yaml --- r: 278526 b: refs/heads/master c: 6626873980475f303367f7b709f4703b571cf854 h: refs/heads/master v: v3 --- [refs] | 2 +- .../net/ethernet/emulex/benet/be_main.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9e72ea9eeaa3..623f1c30bf78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26cf820d49ee23472191824000b3234c4bffb1a5 +refs/heads/master: 6626873980475f303367f7b709f4703b571cf854 diff --git a/trunk/drivers/net/ethernet/emulex/benet/be_main.c b/trunk/drivers/net/ethernet/emulex/benet/be_main.c index 7236280c1af0..3854fb0610ba 100644 --- a/trunk/drivers/net/ethernet/emulex/benet/be_main.c +++ b/trunk/drivers/net/ethernet/emulex/benet/be_main.c @@ -2666,6 +2666,19 @@ static int be_setup(struct be_adapter *adapter) return status; } +#ifdef CONFIG_NET_POLL_CONTROLLER +static void be_netpoll(struct net_device *netdev) +{ + struct be_adapter *adapter = netdev_priv(netdev); + struct be_rx_obj *rxo; + int i; + + event_handle(adapter, &adapter->tx_eq, false); + for_all_rx_queues(adapter, rxo, i) + event_handle(adapter, &rxo->rx_eq, true); +} +#endif + #define FW_FILE_HDR_SIGN "ServerEngines Corp. " static bool be_flash_redboot(struct be_adapter *adapter, const u8 *p, u32 img_start, int image_size, @@ -3014,7 +3027,10 @@ static struct net_device_ops be_netdev_ops = { .ndo_set_vf_mac = be_set_vf_mac, .ndo_set_vf_vlan = be_set_vf_vlan, .ndo_set_vf_tx_rate = be_set_vf_tx_rate, - .ndo_get_vf_config = be_get_vf_config + .ndo_get_vf_config = be_get_vf_config, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_poll_controller = be_netpoll, +#endif }; static void be_netdev_init(struct net_device *netdev)