aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e1000/e1000.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/e1000/e1000.h')
-rw-r--r--drivers/net/e1000/e1000.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 65298a6d9af7..99288b95aead 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -324,18 +324,20 @@ enum e1000_state_t {
324extern struct net_device *e1000_get_hw_dev(struct e1000_hw *hw); 324extern struct net_device *e1000_get_hw_dev(struct e1000_hw *hw);
325#define e_dbg(format, arg...) \ 325#define e_dbg(format, arg...) \
326 netdev_dbg(e1000_get_hw_dev(hw), format, ## arg) 326 netdev_dbg(e1000_get_hw_dev(hw), format, ## arg)
327#define e_err(format, arg...) \ 327#define e_err(msglvl, format, arg...) \
328 netdev_err(adapter->netdev, format, ## arg) 328 netif_err(adapter, msglvl, adapter->netdev, format, ## arg)
329#define e_info(format, arg...) \ 329#define e_info(msglvl, format, arg...) \
330 netdev_info(adapter->netdev, format, ## arg) 330 netif_info(adapter, msglvl, adapter->netdev, format, ## arg)
331#define e_warn(format, arg...) \ 331#define e_warn(msglvl, format, arg...) \
332 netdev_warn(adapter->netdev, format, ## arg) 332 netif_warn(adapter, msglvl, adapter->netdev, format, ## arg)
333#define e_notice(format, arg...) \ 333#define e_notice(msglvl, format, arg...) \
334 netdev_notice(adapter->netdev, format, ## arg) 334 netif_notice(adapter, msglvl, adapter->netdev, format, ## arg)
335#define e_dev_info(format, arg...) \ 335#define e_dev_info(format, arg...) \
336 dev_info(&adapter->pdev->dev, format, ## arg) 336 dev_info(&adapter->pdev->dev, format, ## arg)
337#define e_dev_warn(format, arg...) \ 337#define e_dev_warn(format, arg...) \
338 dev_warn(&adapter->pdev->dev, format, ## arg) 338 dev_warn(&adapter->pdev->dev, format, ## arg)
339#define e_dev_err(format, arg...) \
340 dev_err(&adapter->pdev->dev, format, ## arg)
339 341
340extern char e1000_driver_name[]; 342extern char e1000_driver_name[];
341extern const char e1000_driver_version[]; 343extern const char e1000_driver_version[];