| Message ID | 20090513084011.GC3517@psychotron.englab.brq.redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi Jiri, On Wed, 13 May 2009 10:40:12 +0200 Jiri Pirko <jpirko@redhat.com> wrote: > > Missed part of "&" removal. Also added to linux-next until Dave has time. All three are now in my "fixes" tree.
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Thu, 14 May 2009 10:36:11 +1000 > Hi Jiri, > > On Wed, 13 May 2009 10:40:12 +0200 Jiri Pirko <jpirko@redhat.com> wrote: >> >> Missed part of "&" removal. > > Also added to linux-next until Dave has time. > > All three are now in my "fixes" tree. I've put these fixes into net-next-2.6 and pushed them out to kernel.org, so you shouldn't need to carry them in your fixes tree any longer. Thanks! -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Dave, On Sun, 17 May 2009 14:00:04 -0700 (PDT) David Miller <davem@davemloft.net> wrote: > > I've put these fixes into net-next-2.6 and pushed them out to > kernel.org, so you shouldn't need to carry them in your > fixes tree any longer. Yep, thanks. Though if you had put them into net-current and sent them to Linus (as preemptive fixes) there would have been no bisection hole in Linus' tree. Just a minor point.
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Mon, 18 May 2009 10:32:51 +1000 > Though if you had put them into net-current and sent them to Linus (as > preemptive fixes) there would have been no bisection hole in Linus' > tree. Just a minor point. Indeed, in retrospect that might have been a better approach. I will keep that in mind for similar future situations, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index febae70..9208cf5 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -935,7 +935,7 @@ static int llc_ui_getname(struct socket *sock, struct sockaddr *uaddr, if (llc->dev) { sllc.sllc_arphrd = llc->dev->type; - memcpy(&sllc.sllc_mac, &llc->dev->dev_addr, + memcpy(&sllc.sllc_mac, llc->dev->dev_addr, IFHWADDRLEN); } }
Missed part of "&" removal. Signed-off-by: Jiri Pirko <jpirko@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html