summarylogtreecommitdiffstats
path: root/linux-4.20.patch
blob: d764d857a53610946355cdf9ff0cb23ba2281af4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
*** a/asix.c	2019-01-16 12:10:22.829797420 +0100
--- b/asix.c	2019-01-16 12:11:59.521251711 +0100
***************
*** 1034,1041 ****
--- 1034,1043 ----
  	.set_wol		= ax8817x_set_wol,
  	.get_eeprom_len	= ax8817x_get_eeprom_len,
  	.get_eeprom		= ax8817x_get_eeprom,
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0)
  	.get_settings		= ax8817x_get_settings,
  	.set_settings		= ax8817x_set_settings,
+ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0) */
  };
  
  static int ax8817x_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
***************
*** 1327,1334 ****
--- 1329,1338 ----
  	.set_wol		= ax8817x_set_wol,
  	.get_eeprom_len		= ax8817x_get_eeprom_len,
  	.get_eeprom		= ax8817x_get_eeprom,
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0)
  	.get_settings		= ax8817x_get_settings,
  	.set_settings		= ax8817x_set_settings,
+ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0) */
  };
  
  static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf)
***************
*** 1934,1941 ****
--- 1938,1947 ----
  	.set_wol		= ax8817x_set_wol,
  	.get_eeprom_len		= ax8817x_get_eeprom_len,
  	.get_eeprom		= ax8817x_get_eeprom,
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0)
  	.get_settings		= ax8817x_get_settings,
  	.set_settings		= ax8817x_set_settings,
+ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0) */
  #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
  	.set_tx_csum		= ax88772b_set_tx_csum,
  	.get_tx_csum		= ax88772b_get_tx_csum,
*** a/axusbnet.c	2019-01-16 12:10:27.516534560 +0100
--- b/axusbnet.c	2019-01-16 12:12:34.741781672 +0100
***************
*** 896,903 ****
--- 896,905 ----
  
  /* drivers may override default ethtool_ops in their bind() routine */
  static struct ethtool_ops axusbnet_ethtool_ops = {
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0)
  	.get_settings		= axusbnet_get_settings,
  	.set_settings		= axusbnet_set_settings,
+ #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0) */
  	.get_link		= axusbnet_get_link,
  	.nway_reset		= axusbnet_nway_reset,
  	.get_drvinfo		= axusbnet_get_drvinfo,