Commit 97270814 authored by Jan Kiszka's avatar Jan Kiszka

driver/net: Update to kernel 5.4

linux/pci-aspm.h has been folded into linux/pci.h in that version.
Account for that in drivers that actually need it.

Furthermore, our implementation of SO_SNDTIMEO is now SO_SNDTIMEO_OLD
until 2038 has been addressed.
Signed-off-by: Jan Kiszka's avatarJan Kiszka <jan.kiszka@siemens.com>
parent 6c3c9702
......@@ -38,7 +38,6 @@
#include <linux/io.h>
#include <linux/netdevice.h>
#include <linux/pci.h>
#include <linux/pci-aspm.h>
#include <linux/crc32.h>
#include <linux/if_vlan.h>
......
......@@ -53,6 +53,10 @@
#include <linux/aer.h>
#include <linux/prefetch.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
#include <linux/pci-aspm.h>
#endif
#include "e1000.h"
#define RT_E1000E_NUM_RXD 64
......
......@@ -42,7 +42,6 @@
#include <linux/if.h>
#include <linux/if_vlan.h>
#include <linux/pci.h>
#include <linux/pci-aspm.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/ip.h>
......
......@@ -69,7 +69,6 @@ RTL8169_VERSION "2.2" <2004/08/09>
*/
#include <linux/module.h>
#include <linux/pci-aspm.h>
#include <linux/pci.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
......@@ -79,6 +78,10 @@ RTL8169_VERSION "2.2" <2004/08/09>
#include <linux/timer.h>
#include <linux/init.h>
#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
#include <linux/pci-aspm.h>
#endif
#include <rtnet_port.h> /*** RTnet ***/
#define RTL8169_VERSION "2.2-04"
......
......@@ -1762,7 +1762,7 @@ static int rt_tcp_setsockopt(struct rtdm_fd *fd, struct tcp_socket *ts,
*/
return 0;
case SO_SNDTIMEO:
case SO_SNDTIMEO_OLD:
if (optlen < sizeof(tv))
return -EINVAL;
if (rtdm_copy_from_user(fd, &tv, optval, sizeof(tv)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment