[1/1] r8152: sync sa_family with the media type of network device

Commit Message

Crag Wang April 19, 2019, 8:45 a.m. UTC

From: "Crag.Wang" <[e-mail]>

Without this patch the socket address family sporadically gets wrong
value ends up the dev_set_mac_address() fails to set the desired MAC
address.

Change-Id: Ib48a303730bee81667a2859be32e48cc8a66f277
Signed-off-by: Crag.Wang <[e-mail]>
---
 drivers/net/usb/r8152.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Greg Kroah-Hartman April 19, 2019, 7:37 p.m. UTC | #1

On Fri, Apr 19, 2019 at 04:45:46PM +0800, [e-mail] wrote:
> From: "Crag.Wang" <[e-mail]>
> 
> Without this patch the socket address family sporadically gets wrong
> value ends up the dev_set_mac_address() fails to set the desired MAC
> address.
> 
> Change-Id: Ib48a303730bee81667a2859be32e48cc8a66f277

No need for this line here, I don't think you ran checkpatch.pl on your
change before sending it out :(

Crag Wang April 22, 2019, 1:55 a.m. UTC | #2

Greg KH <[e-mail]> 於 2019年4月20日 週六 上午3:37寫道：
>
> On Fri, Apr 19, 2019 at 04:45:46PM +0800, [e-mail] wrote:
> > From: "Crag.Wang" <[e-mail]>
> >
> > Without this patch the socket address family sporadically gets wrong
> > value ends up the dev_set_mac_address() fails to set the desired MAC
> > address.
> >
> > Change-Id: Ib48a303730bee81667a2859be32e48cc8a66f277
>
> No need for this line here, I don't think you ran checkpatch.pl on your
> change before sending it out :(

I added param to skip the verification of gerrit change-id, will
remove this line in v2 and upload.

Crag

Patch

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 4c63b40d5e00..41fb39ce69c9 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -1225,6 +1225,8 @@  static int determine_ethernet_addr(struct r8152 *tp, struct sockaddr *sa)
 	struct net_device *dev = tp->netdev;
 	int ret;
 
+	sa->sa_family = dev->type;
+
 	if (tp->version == RTL_VER_01) {
 		ret = pla_ocp_read(tp, PLA_IDR, 8, sa->sa_data);
 	} else {