diff options
| author | David S. Miller <davem@davemloft.net> | 2016-06-30 13:12:23 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-30 13:12:23 (GMT) |
| commit | c435e6e04847e1fcadbbdd5437489ee84e194851 (patch) | |
| tree | 8b4a7dedbced3b5fa80b7f6ee1edfa0839d324a9 /drivers/net/ethernet/netronome/nfp/nfp_net.h | |
| parent | 6fde0e63eccbaf21fa278b240b8129fec14b864b (diff) | |
| parent | 2370def2e42e488cfae6a0ad0ca8331d10457cbe (diff) | |
| download | linux-c435e6e04847e1fcadbbdd5437489ee84e194851.tar.xz | |
Merge branch 'nfp-next'
Jakub Kicinski says:
====================
nfp: few code improvements
Three small patches for net-next. First and second patches
improve the code quality by spelling things correctly and
removing unused parameters. Third patch hooks-in standard
kernel implementation of .get_link() in ethtool ops.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/nfp_net.h')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_net.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net.h b/drivers/net/ethernet/netronome/nfp/nfp_net.h index e744acc..6906356 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net.h +++ b/drivers/net/ethernet/netronome/nfp/nfp_net.h @@ -63,7 +63,7 @@ #define NFP_NET_POLL_TIMEOUT 5 /* Bar allocation */ -#define NFP_NET_CRTL_BAR 0 +#define NFP_NET_CTRL_BAR 0 #define NFP_NET_Q0_BAR 2 #define NFP_NET_Q1_BAR 4 /* OBSOLETE */ |