Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[linux-2.6-microblaze.git] / drivers / net / ethernet / sfc / ef10.c

diff --git a/drivers/net/ethernet/sfc/ef10.c b/drivers/net/ethernet/sfc/ef10.c
index 8b62ce2..ab979fd 100644 (file)
--- a/drivers/net/ethernet/sfc/ef10.c
+++ b/drivers/net/ethernet/sfc/ef10.c
@@ -3877,7 +3877,7 @@ static int efx_ef10_udp_tnl_set_port(struct net_device *dev,
                                     unsigned int table, unsigned int entry,
                                     struct udp_tunnel_info *ti)
 {
-       struct efx_nic *efx = netdev_priv(dev);
+       struct efx_nic *efx = efx_netdev_priv(dev);
        struct efx_ef10_nic_data *nic_data;
        int efx_tunnel_type, rc;
 
@@ -3937,7 +3937,7 @@ static int efx_ef10_udp_tnl_unset_port(struct net_device *dev,
                                       unsigned int table, unsigned int entry,
                                       struct udp_tunnel_info *ti)
 {
-       struct efx_nic *efx = netdev_priv(dev);
+       struct efx_nic *efx = efx_netdev_priv(dev);
        struct efx_ef10_nic_data *nic_data;
        int rc;