Attachment 315634 Details for Bug 457567 – revised mii fallback patch

[patch] revised mii fallback patch

piranha-0.8.4-mii-fallback.patch (text/plain), 993 bytes, created by Bryn M. Reeves on 2008-09-03 11:11:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bryn M. Reeves

Created: 2008-09-03 11:11:30 UTC

Size: 993 bytes

patch

obsolete

>diff -up piranha/linkstate.c.mii-fallback piranha/linkstate.c
>--- piranha/linkstate.c.mii-fallback	2008-09-03 12:05:14.000000000 +0100
>+++ piranha/linkstate.c	2008-09-03 12:06:15.000000000 +0100
>@@ -58,6 +58,7 @@
> #define u8 __u8
> 
> #include <linux/ethtool.h>
>+#include <linux/mii.h>
> #include <net/if.h>
> 
> static int get_link_state(int fd, struct ifreq *ifr);
>@@ -163,8 +164,16 @@ get_link_state(int fd, struct ifreq *ifr
>         if (err == 0) {
> 		return edata.data;
>         } else if (errno == EOPNOTSUPP) {
>-		/* oops, pretend the link's there */
>-		return 1;
>+		/* oops, try falling back to MII */
>+		struct mii_ioctl_data *mii = (struct mii_ioctl_data *)&ifr->ifr_data;
>+		memset(mii, 0, sizeof(*mii));
>+		mii->reg_num = MII_BMSR;
>+		err = ioctl(fd, SIOCGMIIREG, ifr);
>+		if (!err)
>+			return (mii->val_out & BMSR_LSTATUS ? 1 : 0);
>+		/* No ETHTOOL or MII support - pretend the link's there */
>+		if (errno == EOPNOTSUPP)
>+			return 1;
>         }
> 
> 	/* Any other errors: no link? */

Actions: View | Diff

Attachments on bug 457567: 313206 | 315634