]> www.infradead.org Git - users/jedix/linux-maple.git/commit
ip_options: git meerge fix: do not duplicate setting of daddr
authorMaxim Uvarov <maxim.uvarov@oracle.com>
Thu, 29 Nov 2012 07:23:49 +0000 (23:23 -0800)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Thu, 29 Nov 2012 07:25:10 +0000 (23:25 -0800)
commitdaa25b954a4e0c51658c4dc76a103ff8312afd58
tree31d17dcd2a5228732b613f8c621350b20609f9c4
parent94ba1dd62156b053d362ece3015c2fcba0fd9159
ip_options: git meerge fix: do not duplicate setting of daddr

Orabug: 15929855
Git merge duplicated line of setting daddr. This is not critical
but doing clean up here.
Signed-off-by: Maxim Uvarov <maxim.uvarov@oracle.com>
net/ipv4/ip_options.c