* Re: [PATCH 1/5] tcp: heed result of security_inet_conn_request() in tcp_v6_conn_request()
From: David Miller @ 2012-06-25 23:05 UTC (permalink / raw)
To: eric.dumazet; +Cc: ncardwell, netdev, edumazet, therbert
In-Reply-To: <1340523417.23933.4.camel@edumazet-glaptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 24 Jun 2012 09:36:57 +0200
> On Sun, 2012-06-24 at 01:22 -0400, Neal Cardwell wrote:
>> If security_inet_conn_request() returns non-zero then TCP/IPv6 should
>> drop the request, just as in TCP/IPv4 and DCCP in both IPv4 and IPv6.
>>
>> Signed-off-by: Neal Cardwell <ncardwell@google.com>
>> ---
>> net/ipv6/tcp_ipv6.c | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
>> index 3a9aec2..9df64a5 100644
>> --- a/net/ipv6/tcp_ipv6.c
>> +++ b/net/ipv6/tcp_ipv6.c
>> @@ -1212,7 +1212,8 @@ have_isn:
>> tcp_rsk(req)->snt_isn = isn;
>> tcp_rsk(req)->snt_synack = tcp_time_stamp;
>>
>> - security_inet_conn_request(sk, skb, req);
>> + if (security_inet_conn_request(sk, skb, req))
>> + goto drop_and_release;
>>
>> if (tcp_v6_send_synack(sk, req,
>> (struct request_values *)&tmp_ext,
>
> Acked-by: Eric Dumazet <edumazet@google.com>
Applied to 'net'.
^ permalink raw reply
* Re: [PATCH 5/5] tcp: plug dst leak in tcp_v6_conn_request()
From: David Miller @ 2012-06-25 23:06 UTC (permalink / raw)
To: ncardwell; +Cc: eric.dumazet, netdev, edumazet, therbert
In-Reply-To: <CADVnQykuAQcj_i5cZQphKnnoHaCPMd6xLBmq1ZSAeZs83z3tfw@mail.gmail.com>
From: Neal Cardwell <ncardwell@google.com>
Date: Sun, 24 Jun 2012 13:12:33 -0400
> Yes, the patches in this series were generated as patches against the
> "net" tree (sorry for not indicating that).
>
> The dst leak on the v6 sysctl_tw_recycle code path (patches 2-5) seems
> like a pretty low priority, so I think we could simplify your plan
> even a little further... How about this as a plan: we could apply the
> first patch in the series (tcp: heed result of
> security_inet_conn_request() in tcp_v6_conn_request()) to the net tree
> now, and skip patches 2-5 for now. Once your pending synack work is in
> net-next, I can respin patches 2-5 for net-next. How does that sound?
I've applied the first patch to 'net' and you can simply respin
your patches against net-next right now since I rejected Eric's
SYN-ACK patches.
^ permalink raw reply
* Re: [net 1/3] caif: Clear shutdown mask to zero at reconnect.
From: David Miller @ 2012-06-25 23:07 UTC (permalink / raw)
To: sjur.brandeland; +Cc: netdev, sjurbren
In-Reply-To: <1340571698-17892-1-git-send-email-sjur.brandeland@stericsson.com>
From: sjur.brandeland@stericsson.com
Date: Sun, 24 Jun 2012 23:01:36 +0200
> From: Sjur Brændeland <sjur.brandeland@stericsson.com>
>
> Clear caif sockets's shutdown mask at (re)connect.
>
> Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Applied.
^ permalink raw reply
* Re: [net 2/3] caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost
From: David Miller @ 2012-06-25 23:07 UTC (permalink / raw)
To: sjur.brandeland; +Cc: netdev, sjurbren, Per.Ellefsen
In-Reply-To: <1340571698-17892-2-git-send-email-sjur.brandeland@stericsson.com>
From: sjur.brandeland@stericsson.com
Date: Sun, 24 Jun 2012 23:01:37 +0200
> From: Per Ellefsen <Per.Ellefsen@stericsson.com>
>
> When receiving a piggyback'ed descriptor containing an
> embedded frame, but no payload, the embedded frame was
> lost.
>
> Signed-off-by: Per Ellefsen <per.ellefsen@stericsson.com>
> Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Applied.
^ permalink raw reply
* Re: [net 3/3] caif-hsi: Add missing return in error path
From: David Miller @ 2012-06-25 23:07 UTC (permalink / raw)
To: sjur.brandeland; +Cc: netdev, sjurbren
In-Reply-To: <1340571698-17892-3-git-send-email-sjur.brandeland@stericsson.com>
From: sjur.brandeland@stericsson.com
Date: Sun, 24 Jun 2012 23:01:38 +0200
> From: Sjur Brændeland <sjur.brandeland@stericsson.com>
>
> Fix a missing return, causing access to freed memory.
>
> Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com>
Applied.
^ permalink raw reply
* Re: [PATCH net-next] net: Remove 'unlikely' qualifier in skb_steal_sock()
From: David Miller @ 2012-06-25 23:08 UTC (permalink / raw)
To: eric.dumazet; +Cc: subramanian.vijay, netdev, alexander.h.duyck, shemminger
In-Reply-To: <1340604577.23933.23.camel@edumazet-glaptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 25 Jun 2012 08:09:37 +0200
> On Sun, 2012-06-24 at 16:03 -0700, Vijay Subramanian wrote:
>> With early demux enabled by default for TCP flows, there is high chance that
>> skb->sk will be non-null. 'unlikely()' was removed from __inet_lookup_skb() but
>> maybe it can be removed from skb_steal_sock() as well.
>>
>> Note: skb_steal_sock() is also called by __inet6_lookup_skb() and
>> __udp4_lib_lookup_skb() but they are protected by their own 'unlikely' calls.
>>
>> Signed-off-by: Vijay Subramanian <subramanian.vijay@gmail.com>
>> ---
>
> Acked-by: Eric Dumazet <edumazet@google.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH net-next] net: struct sock cleanups
From: David Miller @ 2012-06-25 23:09 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev
In-Reply-To: <1340605369.10893.3.camel@edumazet-glaptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 25 Jun 2012 08:22:49 +0200
> From: Eric Dumazet <edumazet@google.com>
>
> Add missing kernel doc for sk_rx_dst
>
> Move sk_rx_dst to avoid two 32bit holes on 64bit arches
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
Applied, thanks Eric.
^ permalink raw reply
* Re: [PATCH net-next 0/2] be2net fixes
From: David Miller @ 2012-06-25 23:10 UTC (permalink / raw)
To: somnath.kotur; +Cc: netdev
In-Reply-To: <a5b0dbf3-1d39-41a2-9723-b28abd578852@exht1.ad.emulex.com>
From: Somnath Kotur <somnath.kotur@emulex.com>
Date: Mon, 25 Jun 2012 11:08:12 +0530
> Pls apply.
>
> Somnath Kotur (2):
> be2net: Explicitly clear the reserved field in the Tx Descriptor
> be2net: Regression bug wherein VFs creation broken for multiple
> cards.
Applied, thanks.
^ permalink raw reply
* Re: [PATCH 1/4] netdev/phy: Handle IEEE802.3 clause 45 Ethernet PHYs
From: David Daney @ 2012-06-25 23:11 UTC (permalink / raw)
To: David Miller
Cc: grant.likely, rob.herring, devicetree-discuss, netdev,
linux-kernel, linux-mips, afleming, david.daney
In-Reply-To: <20120625.153440.17010814246237639.davem@davemloft.net>
On 06/25/2012 03:34 PM, David Miller wrote:
> From: David Daney<ddaney.cavm@gmail.com>
> Date: Fri, 22 Jun 2012 17:24:13 -0700
>
>> From: David Daney<david.daney@cavium.com>
>>
>> The IEEE802.3 clause 45 MDIO bus protocol allows for directly
>> addressing PHY registers using a 21 bit address, and is used by many
>> 10G Ethernet PHYS. Already existing is the ability of MDIO bus
>> drivers to use clause 45, with the MII_ADDR_C45 flag. Here we add
>> struct phy_c45_device_ids to hold the device identifier registers
>> present in clause 45. struct phy_device gets a couple of new fields:
>> c45_ids to hold the identifiers and is_c45 to signal that it is clause
>> 45.
>>
>> Normally the MII_ADDR_C45 flag is ORed with the register address to
>> indicate a clause 45 transaction. Here we also use this flag in the
>> *device* address passed to get_phy_device() to indicate that probing
>> should be done with clause 45 transactions.
>>
>> EXPORT phy_device_create() so that the follow-on patch to of_mdio.c
>> can use it to create phy devices for PHYs, that have non-standard
>> device identifier registers, based on the device tree bindings.
>>
>> Signed-off-by: David Daney<david.daney@cavium.com>
>
> I see no value in having two ways to say that clause-45 transactions
> should be used.
>
> Either make it a PHY device attribute, or specify it in the address
> in the register accesses, but not both.
>
Do you realize that at the time get_phy_device() is called, there is no
PHY device? So there can be no attribute, nor are we passing a register
address. Neither of these suggestions apply to this situation.
We need to know a priori if it is c22 or c45. So we need to communicate
the type somehow to get_phy_device(). I chose an unused bit in the addr
parameter to do this, another option would be to add a separate
parameter to get_phy_device() specifying the type.
> Also your patch is full of coding style errors, I simply couldn't
> stomache applying this even if I agreed with the substance of the
> changes:
>
>> + i< ARRAY_SIZE(c45_ids->device_ids)&&
>> + c45_ids->devices_in_package == 0;
>
> c45_ids on the second line should line up with the initial 'i'
> on the first line.
>
>> + c45_ids->devices_in_package = (phy_reg& 0xffff)<< 16;
>> +
>> +
>> + reg_addr = MII_ADDR_C45 | i<< 16 | 5;
>
> There is not reason in the world to have two empty lines there, it
> looks awful.
OK, I will fix those...
>
>> + /*
>> + * If mostly Fs, there is no device there,
>> + * let's get out of here.
>> + */
>
> Format comments:
>
> /* Like
> * this.
> */
>
> Not.
>
> /*
> * Like
> * this.
> */
... and this one too I guess. Really you and Linus should come to a
consensus on this one.
[...]
>
>> +/*
>> + * phy_c45_device_ids: 802.3-c45 Device Identifiers
>> + *
>> + * devices_in_package: Bit vector of devices present.
>> + * device_ids: The device identifer for each present device.
>> + */
>
> If you're going to list the struct members use the correct kerneldoc
> format to do so.
OK.
David Daney
^ permalink raw reply
* Re: pull request: batman-adv 2012-06-25
From: David Miller @ 2012-06-25 23:19 UTC (permalink / raw)
To: ordex-GaUfNO9RBHfsrOwW+9ziJQ
Cc: netdev-u79uwXL29TY76Z2rM5mHXA,
b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r
In-Reply-To: <1340607284-29950-1-git-send-email-ordex-GaUfNO9RBHfsrOwW+9ziJQ@public.gmane.org>
From: Antonio Quartulli <ordex-GaUfNO9RBHfsrOwW+9ziJQ@public.gmane.org>
Date: Mon, 25 Jun 2012 08:54:24 +0200
> this is another set of changes intended for net-next/linux-3.6.
>
> This patchset is entirely composed by "namespace renaming" patches.
>
> Please, let me know if there is any problem.
Pulled, but you really, _REALLY_, should have let me pull 'net'
into 'net-next' to resolve the conflicts in translation-table.c
before sending this work to me.
I did that merge before getting to this pull request and did my
best merging things together.
But I know I made mistakes, so please send me whatever fixups
are necessary.
Thanks.
^ permalink raw reply
* Re: [PATCH 1/1] ipheth: add support for iPad
From: David Miller @ 2012-06-25 23:21 UTC (permalink / raw)
To: rainbow; +Cc: gregkh, linux-usb, netdev, linux-kernel
In-Reply-To: <1340607887-28648-1-git-send-email-rainbow@irh.it>
From: Davide Gerhard <rainbow@irh.it>
Date: Mon, 25 Jun 2012 09:04:47 +0200
> This adds support for the iPad to the ipheth driver.
> (product id = 0x129a)
>
> Signed-off-by: Davide Gerhard <rainbow@irh.it>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH] net/ipv6/route.c: packets originating on device match lo
From: David Miller @ 2012-06-25 23:28 UTC (permalink / raw)
To: david_mccullough; +Cc: netdev
In-Reply-To: <20120625065030.GA28914@mcafee.com>
From: David McCullough <david_mccullough@mcafee.com>
Date: Mon, 25 Jun 2012 16:50:30 +1000
> @@ -931,6 +931,9 @@ struct dst_entry * ip6_route_output(stru
> {
> int flags = 0;
>
> + if (fl6->flowi6_iif == 0)
> + fl6->flowi6_iif = net->loopback_dev->ifindex;
> +
Like ipv4, you should make this assignment unconditionally.
Thanks.
^ permalink raw reply
* Re: [PATCH net V1 0/3] net/mlx4: Bug fixes for the mlx4_en driver
From: David Miller @ 2012-06-25 23:30 UTC (permalink / raw)
To: yevgenyp; +Cc: netdev
In-Reply-To: <1340619853-29804-1-git-send-email-yevgenyp@mellanox.co.il>
From: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Date: Mon, 25 Jun 2012 13:24:10 +0300
> This is a set of 3 bug fixes generated agains net tree:
>
> ---
> Diff from V1:
> Removed atomic counter patch for rework.
>
> Yevgeny Petrilin (3):
> net/mlx4_en: Set correct port parameters during device initialization
> net/mlx4: Use single completion vector after NOP failure
> net/mlx4_en: Release QP range in free_resources
All applied, thanks.
^ permalink raw reply
* Re: [PATCH] net: l2tp_eth: fix l2tp_eth_dev_xmit race
From: David Miller @ 2012-06-25 23:31 UTC (permalink / raw)
To: eric.dumazet; +Cc: netdev, jchapman
In-Reply-To: <1340621114.10893.29.camel@edumazet-glaptop>
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 25 Jun 2012 12:45:14 +0200
> From: Eric Dumazet <edumazet@google.com>
>
> Its illegal to dereference skb after giving it to l2tp_xmit_skb()
> as it might be already freed/reused.
>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Cc: James Chapman <jchapman@katalix.com>
Applied, thanks Eric.
^ permalink raw reply
* Re: [PATCH 1/4] netdev/phy: Handle IEEE802.3 clause 45 Ethernet PHYs
From: David Miller @ 2012-06-25 23:33 UTC (permalink / raw)
To: ddaney.cavm
Cc: grant.likely, rob.herring, devicetree-discuss, netdev,
linux-kernel, linux-mips, afleming, david.daney
In-Reply-To: <4FE8F01B.2020207@gmail.com>
From: David Daney <ddaney.cavm@gmail.com>
Date: Mon, 25 Jun 2012 16:11:23 -0700
> Do you realize that at the time get_phy_device() is called, there is
> no PHY device? So there can be no attribute, nor are we passing a
> register address. Neither of these suggestions apply to this
> situation.
>
> We need to know a priori if it is c22 or c45. So we need to
> communicate the type somehow to get_phy_device(). I chose an unused
> bit in the addr parameter to do this, another option would be to add a
> separate parameter to get_phy_device() specifying the type.
Then pass it in to the get() routine and store the attribute there
in the device we end up with.
There are many parameters that go into a PHY register access, so
we'll probably some day end up with a descriptor struct that the
caller prepares on-stack to pass into the actual read/write ops
via reference.
> ... and this one too I guess. Really you and Linus should come to a
> consensus on this one.
We did come up with a consensus, which is that subsystem maintainers
such as myself are at liberty to enforce localized coding style for
the bodies of code they maintain.
^ permalink raw reply
* Re: [PATCH fix] mac802154: add missed braces
From: David Miller @ 2012-06-25 23:35 UTC (permalink / raw)
To: alex.bluesman.smirnov; +Cc: netdev
In-Reply-To: <1340631013-27556-1-git-send-email-alex.bluesman.smirnov@gmail.com>
From: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Date: Mon, 25 Jun 2012 17:30:13 +0400
> Add missed braces after 'if' operator.
>
> Signed-off-by: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Applied, thanks.
^ permalink raw reply
* Re: [PATCH 1/7] mac802154: add wpan device-class support
From: David Miller @ 2012-06-25 23:37 UTC (permalink / raw)
To: alex.bluesman.smirnov; +Cc: netdev, dbaryshkov
In-Reply-To: <1340631197-27691-2-git-send-email-alex.bluesman.smirnov@gmail.com>
From: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Date: Mon, 25 Jun 2012 17:33:11 +0400
> + list_for_each_entry_rcu(sdata, &priv->slaves, list)
> + {
> + if (sdata->type != IEEE802154_DEV_WPAN)
> + continue;
> +
> + sskb = skb_clone(skb, GFP_ATOMIC);
> + if (sskb)
> + mac802154_subif_frame(sdata, sskb);
> + }
This is not the correct way to place braces. It should be:
x() {
...
}
not:
x()
{
}
^ permalink raw reply
* Re: [PATCH 0/7] mac802154: basic wpan class-device support
From: David Miller @ 2012-06-25 23:39 UTC (permalink / raw)
To: alex.bluesman.smirnov; +Cc: netdev, dbaryshkov
In-Reply-To: <1340631197-27691-1-git-send-email-alex.bluesman.smirnov@gmail.com>
Please fix the coding style problems in patch #1 and resubmit this
series.
Thanks.
^ permalink raw reply
* Re: [net-next 00/11] caif patch-set for net-next
From: David Miller @ 2012-06-25 23:44 UTC (permalink / raw)
To: sjur.brandeland; +Cc: netdev, sjurbren
In-Reply-To: <1340646583-21059-1-git-send-email-sjur.brandeland@stericsson.com>
From: sjur.brandeland@stericsson.com
Date: Mon, 25 Jun 2012 19:49:32 +0200
> From: Sjur Brændeland <sjur.brandeland@stericsson.com>
>
> The first 8 patches are fixes,
> there are a couple of fixes for issues found by static code analysis (coverity),
> and some other misc cleanups/fixes.
>
> The three last patches introduces rtnl for managing
> the HSI interface and removes the use of module parameters.
All applied, thanks.
^ permalink raw reply
* Re: [PATCH 0/3 v3 resend] 6lowpan: minor fixes
From: David Miller @ 2012-06-25 23:45 UTC (permalink / raw)
To: alex.bluesman.smirnov; +Cc: netdev, dbaryshkov
In-Reply-To: <1340632143-27794-1-git-send-email-alex.bluesman.smirnov@gmail.com>
From: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Date: Mon, 25 Jun 2012 17:49:00 +0400
> I sent this set several weeks ago and seems that it was missed
> (or please let me know if there was a reason).
>
> this is the 3-rd version of the patches.
> Changes since v2:
> - Removed WARN_ON() and BUG() from skb fetch methods. That wasn't a good idea
> to crash kernel by such an unsignificant issue.
> - Added new patch (I've decided to add it here just to keep all the 6lowpan
> related code together)
All applied, thanks.
^ permalink raw reply
* Re: [PATCH 1/4] netdev/phy: Handle IEEE802.3 clause 45 Ethernet PHYs
From: David Daney @ 2012-06-25 23:48 UTC (permalink / raw)
To: David Miller
Cc: ddaney.cavm, grant.likely, rob.herring, devicetree-discuss,
netdev, linux-kernel, linux-mips, afleming, david.daney
In-Reply-To: <20120625.163355.2058784474741116830.davem@davemloft.net>
On 06/25/2012 04:33 PM, David Miller wrote:
> From: David Daney<ddaney.cavm@gmail.com>
> Date: Mon, 25 Jun 2012 16:11:23 -0700
>
>> Do you realize that at the time get_phy_device() is called, there is
>> no PHY device? So there can be no attribute, nor are we passing a
>> register address. Neither of these suggestions apply to this
>> situation.
>>
>> We need to know a priori if it is c22 or c45. So we need to
>> communicate the type somehow to get_phy_device(). I chose an unused
>> bit in the addr parameter to do this, another option would be to add a
>> separate parameter to get_phy_device() specifying the type.
>
> Then pass it in to the get() routine and store the attribute there
> in the device we end up with.
OK.
addr has only 5 significant bits, and the patch *does* pass the
information (c22 vs. c45) in one of the high order bits. So it is
essentially as you say, but you don't like the idea of multiplexing the
arguments into a single int.
Therefore, I am going to propose that we add a 'flags' parameter to
get_phy_device() and change the (two) callers.
Does that seem better (or at least acceptable)?
Or do you really want to pass the address of a (one bit) structure instead?
David Daney
>
> There are many parameters that go into a PHY register access, so
> we'll probably some day end up with a descriptor struct that the
> caller prepares on-stack to pass into the actual read/write ops
> via reference.
>
^ permalink raw reply
* Re: [PATCH 1/4] netdev/phy: Handle IEEE802.3 clause 45 Ethernet PHYs
From: David Miller @ 2012-06-25 23:50 UTC (permalink / raw)
To: ddaney.cavm
Cc: grant.likely, rob.herring, devicetree-discuss, netdev,
linux-kernel, linux-mips, afleming, david.daney
In-Reply-To: <4FE8F8D8.1050009@gmail.com>
From: David Daney <ddaney.cavm@gmail.com>
Date: Mon, 25 Jun 2012 16:48:40 -0700
> Therefore, I am going to propose that we add a 'flags' parameter to
> get_phy_device() and change the (two) callers.
Since there is only one flag, make it simply a bool for now.
^ permalink raw reply
* Re: [PATCH] net/ipv6/route.c: packets originating on device match lo
From: David McCullough @ 2012-06-26 1:38 UTC (permalink / raw)
To: David Miller; +Cc: netdev
In-Reply-To: <20120625.162832.804773711822642700.davem@davemloft.net>
Jivin David Miller lays it down ...
> From: David McCullough <david_mccullough@mcafee.com>
> Date: Mon, 25 Jun 2012 16:50:30 +1000
>
> > @@ -931,6 +931,9 @@ struct dst_entry * ip6_route_output(stru
> > {
> > int flags = 0;
> >
> > + if (fl6->flowi6_iif == 0)
> > + fl6->flowi6_iif = net->loopback_dev->ifindex;
> > +
>
> Like ipv4, you should make this assignment unconditionally.
No problems, will resend, I wasn't so sure that I could do that safely
with the flowi getting passed into IPv6 rather than created as it is in
IPv4. Did some extra testing, looks good so patch to follow,
Thanks,
Davidm
--
David McCullough, david_mccullough@mcafee.com, Ph:+61 734352815
McAfee - SnapGear http://www.mcafee.com http://www.uCdot.org
^ permalink raw reply
* [PATCH v2] net/ipv6/route.c: packets originating on device match lo
From: David McCullough @ 2012-06-26 1:42 UTC (permalink / raw)
To: netdev; +Cc: David Miller
Hi all,
Fix to allow IPv6 packets originating locally to match rules with the "iff"
set to "lo". This allows IPv6 rule matching work the same as it does for
IPv4. From the iproute2 man page:
iif NAME
select the incoming device to match. If the interface is loop‐
back, the rule only matches packets originating from this host.
This means that you may create separate routing tables for for‐
warded and local packets and, hence, completely segregate them.
Cheers,
Davidm
Signed-off-by: David McCullough <david_mccullough@mcafee.com>
diff -u -p -r1.1.1.59 route.c
--- linux-3.4/net/ipv6/route.c 21 May 2012 23:15:01 -0000 1.1.1.59
+++ linux-3.4/net/ipv6/route.c 26 Jun 2012 01:41:15 -0000
@@ -931,6 +931,8 @@ struct dst_entry * ip6_route_output(stru
{
int flags = 0;
+ fl6->flowi6_iif = net->loopback_dev->ifindex;
+
if ((sk && sk->sk_bound_dev_if) || rt6_need_strict(&fl6->daddr))
flags |= RT6_LOOKUP_F_IFACE;
--
David McCullough, david_mccullough@mcafee.com, Ph:+61 734352815
McAfee - SnapGear http://www.mcafee.com http://www.uCdot.org
^ permalink raw reply
* linux-next: manual merge of the net-next tree with the net tree
From: Stephen Rothwell @ 2012-06-26 3:15 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Per Ellefsen,
"Sjur Brændeland", Kim Lilliestierna
[-- Attachment #1: Type: text/plain, Size: 988 bytes --]
Hi all,
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/caif/caif_hsi.c between commits 3935600a7f34 ("caif-hsi:
Bugfix - Piggyback'ed embedded CAIF frame lost") and 1fdc7630b2cb
("caif-hsi: Add missing return in error path") from the net tree and
commits 4e7bb59d49fb ("caif-hsi: Removed dead code") and c41254006377
("caif-hsi: Add rtnl support") from the net-next tree.
I fixed them up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/net/caif/caif_hsi.c
index 4a27adb,1c2bd01..0000000
--- a/drivers/net/caif/caif_hsi.c
+++ b/drivers/net/caif/caif_hsi.c
@@@ -693,8 -678,8 +678,6 @@@ static void cfhsi_rx_done(struct cfhsi
*/
memcpy(rx_buf, (u8 *)piggy_desc,
CFHSI_DESC_SHORT_SZ);
- if (desc_pld_len == -EPROTO)
- goto out_of_sync;
- /* Mark no embedded frame here */
- piggy_desc->offset = 0;
}
}
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox