From 75686518c72020f6190b9619721206a928c7368c Mon Sep 17 00:00:00 2001 From: Bjarne von Horn Date: Thu, 1 Feb 2024 09:20:25 +0100 Subject: [PATCH] Remove whitespace. --- README.md | 8 ++++---- devices/e100-3.0-ethercat.c | 2 +- devices/e100-3.10-ethercat.c | 2 +- devices/e100-3.12-ethercat.c | 2 +- devices/e100-3.14-ethercat.c | 2 +- devices/e100-3.16-ethercat.c | 2 +- devices/e100-3.4-ethercat.c | 2 +- devices/e100-3.6-ethercat.c | 2 +- devices/e100-3.8-ethercat.c | 2 +- devices/e100-4.4-ethercat.c | 2 +- devices/e100-5.10-ethercat.c | 2 +- devices/e100-5.14-ethercat.c | 2 +- devices/e100-5.15-ethercat.c | 2 +- devices/e100-5.4-ethercat.c | 2 +- devices/e100-6.1-ethercat.c | 2 +- devices/e100-6.4-ethercat.c | 2 +- devices/igc/Kbuild.in | 2 +- devices/igc/Makefile.am | 2 -- lib/ioctl.h | 1 - 19 files changed, 20 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index ce25d3d9..11411cf3 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,10 @@ information, see http://etherlab.org/en/ethercat. or contact >>> -Dipl.-Ing. (FH) Florian Pose -Ingenieurgemeinschaft IgH -Nordsternstraße 66 -D-45329 Essen +Dipl.-Ing. (FH) Florian Pose +Ingenieurgemeinschaft IgH +Nordsternstraße 66 +D-45329 Essen http://igh.de >>> diff --git a/devices/e100-3.0-ethercat.c b/devices/e100-3.0-ethercat.c index 275d162e..0ac05e49 100644 --- a/devices/e100-3.0-ethercat.c +++ b/devices/e100-3.0-ethercat.c @@ -1196,7 +1196,7 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/e100-3.10-ethercat.c b/devices/e100-3.10-ethercat.c index 392e8354..eebad63b 100644 --- a/devices/e100-3.10-ethercat.c +++ b/devices/e100-3.10-ethercat.c @@ -1211,7 +1211,7 @@ static int e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/e100-3.12-ethercat.c b/devices/e100-3.12-ethercat.c index c1f21ee1..d836b700 100644 --- a/devices/e100-3.12-ethercat.c +++ b/devices/e100-3.12-ethercat.c @@ -1211,7 +1211,7 @@ static int e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/e100-3.14-ethercat.c b/devices/e100-3.14-ethercat.c index 704b80aa..79c01405 100644 --- a/devices/e100-3.14-ethercat.c +++ b/devices/e100-3.14-ethercat.c @@ -1211,7 +1211,7 @@ static int e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/e100-3.16-ethercat.c b/devices/e100-3.16-ethercat.c index fb987a4a..d351280b 100644 --- a/devices/e100-3.16-ethercat.c +++ b/devices/e100-3.16-ethercat.c @@ -1211,7 +1211,7 @@ static int e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/e100-3.4-ethercat.c b/devices/e100-3.4-ethercat.c index c6c9ec9c..df61cb8a 100644 --- a/devices/e100-3.4-ethercat.c +++ b/devices/e100-3.4-ethercat.c @@ -1208,7 +1208,7 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/e100-3.6-ethercat.c b/devices/e100-3.6-ethercat.c index 7cb61176..3acda995 100644 --- a/devices/e100-3.6-ethercat.c +++ b/devices/e100-3.6-ethercat.c @@ -1208,7 +1208,7 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/e100-3.8-ethercat.c b/devices/e100-3.8-ethercat.c index 8ebce4bc..e9ad0534 100644 --- a/devices/e100-3.8-ethercat.c +++ b/devices/e100-3.8-ethercat.c @@ -1208,7 +1208,7 @@ static void e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/e100-4.4-ethercat.c b/devices/e100-4.4-ethercat.c index a6b76089..fe8510cb 100644 --- a/devices/e100-4.4-ethercat.c +++ b/devices/e100-4.4-ethercat.c @@ -1213,7 +1213,7 @@ static int e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/e100-5.10-ethercat.c b/devices/e100-5.10-ethercat.c index 549051b5..77b35b52 100644 --- a/devices/e100-5.10-ethercat.c +++ b/devices/e100-5.10-ethercat.c @@ -1185,7 +1185,7 @@ static int e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/e100-5.14-ethercat.c b/devices/e100-5.14-ethercat.c index d3e44947..5a5980da 100644 --- a/devices/e100-5.14-ethercat.c +++ b/devices/e100-5.14-ethercat.c @@ -1197,7 +1197,7 @@ static int e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/e100-5.15-ethercat.c b/devices/e100-5.15-ethercat.c index 5a96d425..0fcb4480 100644 --- a/devices/e100-5.15-ethercat.c +++ b/devices/e100-5.15-ethercat.c @@ -1185,7 +1185,7 @@ static int e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/e100-5.4-ethercat.c b/devices/e100-5.4-ethercat.c index 8b06a3fc..76ecb32d 100644 --- a/devices/e100-5.4-ethercat.c +++ b/devices/e100-5.4-ethercat.c @@ -1189,7 +1189,7 @@ static int e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/e100-6.1-ethercat.c b/devices/e100-6.1-ethercat.c index f1f2f3ca..5007109e 100644 --- a/devices/e100-6.1-ethercat.c +++ b/devices/e100-6.1-ethercat.c @@ -1185,7 +1185,7 @@ static int e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/e100-6.4-ethercat.c b/devices/e100-6.4-ethercat.c index f1f2f3ca..5007109e 100644 --- a/devices/e100-6.4-ethercat.c +++ b/devices/e100-6.4-ethercat.c @@ -1185,7 +1185,7 @@ static int e100_configure(struct nic *nic, struct cb *cb, struct sk_buff *skb) config->multicast_all = 0x1; /* 1=accept, 0=no */ /* disable WoL when up */ - if (nic->ecdev || + if (nic->ecdev || (netif_running(nic->netdev) || !(nic->flags & wol_magic))) config->magic_packet_disable = 0x1; /* 1=off, 0=on */ diff --git a/devices/igc/Kbuild.in b/devices/igc/Kbuild.in index e2e1d555..d2aab2a9 100644 --- a/devices/igc/Kbuild.in +++ b/devices/igc/Kbuild.in @@ -48,7 +48,7 @@ ifeq (@ENABLE_IGC@,1) igc_mac-@KERNEL_IGC@-ethercat.o \ igc_phy-@KERNEL_IGC@-ethercat.o \ igc_ethtool-@KERNEL_IGC@-ethercat.o \ - igc_nvm-@KERNEL_IGC@-ethercat.o + igc_nvm-@KERNEL_IGC@-ethercat.o CFLAGS_igc_main-@KERNEL_IGC@-ethercat.o = -DREV=$(REV) endif diff --git a/devices/igc/Makefile.am b/devices/igc/Makefile.am index 2e03c396..ea3c2ac3 100644 --- a/devices/igc/Makefile.am +++ b/devices/igc/Makefile.am @@ -117,5 +117,3 @@ EXTRiA_DIST = igc-6.6-ethercat.h \ igc_phy-6.4-ethercat.h \ igc_regs-6.4-ethercat.h \ igc_tsn-6.4-orig.h - - diff --git a/lib/ioctl.h b/lib/ioctl.h index 4ad32d8c..e8a4ae8b 100644 --- a/lib/ioctl.h +++ b/lib/ioctl.h @@ -64,4 +64,3 @@ #endif /* __EC_LIB_IOCTL_H__ */ /*****************************************************************************/ -