summaryrefslogtreecommitdiff
path: root/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch')
-rw-r--r--patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch
index 5360471a..af387875 100644
--- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch
+++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_alx_main.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
-@@ -737,6 +737,7 @@ static int alx_init_sw(struct alx_priv *
+@@ -733,6 +733,7 @@ static int alx_init_sw(struct alx_priv *
}
@@ -8,7 +8,7 @@
static netdev_features_t alx_fix_features(struct net_device *netdev,
netdev_features_t features)
{
-@@ -745,6 +746,7 @@ static netdev_features_t alx_fix_feature
+@@ -741,6 +742,7 @@ static netdev_features_t alx_fix_feature
return features;
}
@@ -16,7 +16,7 @@
static void alx_netif_stop(struct alx_priv *alx)
{
-@@ -821,7 +823,17 @@ static int alx_change_mtu(struct net_dev
+@@ -817,7 +819,17 @@ static int alx_change_mtu(struct net_dev
alx->hw.mtu = mtu;
alx->rxbuf_size = mtu > ALX_DEF_RXBUF_SIZE ?
ALIGN(max_frame, 8) : ALX_DEF_RXBUF_SIZE;
@@ -34,7 +34,7 @@
if (netif_running(netdev))
alx_reinit(alx);
return 0;
-@@ -1180,7 +1192,9 @@ static const struct net_device_ops alx_n
+@@ -1176,7 +1188,9 @@ static const struct net_device_ops alx_n
.ndo_change_mtu = alx_change_mtu,
.ndo_do_ioctl = alx_ioctl,
.ndo_tx_timeout = alx_tx_timeout,
@@ -44,7 +44,7 @@
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = alx_poll_controller,
#endif
-@@ -1298,7 +1312,11 @@ static int alx_probe(struct pci_dev *pde
+@@ -1294,7 +1308,11 @@ static int alx_probe(struct pci_dev *pde
}
}