Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src-draft/trunk]: src/sys/dev/pci Renable SIOC_ADDMULTI/DELMULTI.



details:   https://anonhg.NetBSD.org/src-all/rev/36287260fb13
branches:  trunk
changeset: 949670:36287260fb13
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Sun Oct 04 20:53:03 2020 +1100

description:
Renable SIOC_ADDMULTI/DELMULTI.

diffstat:

 sys/dev/pci/if_iwm.c |  7 +++++++
 sys/dev/pci/if_iwn.c |  2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diffs (43 lines):

diff -r 4f8176e9c817 -r 36287260fb13 sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c      Sun Oct 04 20:07:26 2020 +1100
+++ b/sys/dev/pci/if_iwm.c      Sun Oct 04 20:53:03 2020 +1100
@@ -6988,6 +6988,12 @@
                        err = ENXIO;
                        break;
                }
+               if ((error = ether_ioctl(ifp, cmd, data)) == ENETRESET) {
+                       /* setup multicast filter, etc */
+                       error = 0;
+               }
+               break;
+#if 0
                sa = ifreq_getaddr(SIOCADDMULTI, (struct ifreq *)data);
                err = (cmd == SIOCADDMULTI) ?
                    ether_addmulti(sa, &sc->sc_ec) :
@@ -6995,6 +7001,7 @@
                if (err == ENETRESET)
                        err = 0;
                break;
+#endif
 
        default:
                if (!ISSET(sc->sc_flags, IWM_FLAG_ATTACHED)) {
diff -r 4f8176e9c817 -r 36287260fb13 sys/dev/pci/if_iwn.c
--- a/sys/dev/pci/if_iwn.c      Sun Oct 04 20:07:26 2020 +1100
+++ b/sys/dev/pci/if_iwn.c      Sun Oct 04 20:53:03 2020 +1100
@@ -3748,7 +3748,6 @@
                }
                break;
 
-#if 0
        case SIOCADDMULTI:
        case SIOCDELMULTI:
                if ((error = ether_ioctl(ifp, cmd, data)) == ENETRESET) {
@@ -3756,6 +3755,7 @@
                        error = 0;
                }
                break;
+#if 0
                sa = ifreq_getaddr(SIOCADDMULTI, (struct ifreq *)data);
                error = (cmd == SIOCADDMULTI) ?
                    ether_addmulti(sa, &sc->sc_ec) :



Home | Main Index | Thread Index | Old Index