Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 3 deletions

diff --git a/net/ncsi/ncsi-cmd.c b/net/ncsi/ncsi-cmd.c
index 5c3fad8cba57..0187e65176c0 100644
--- a/net/ncsi/ncsi-cmd.c
+++ b/net/ncsi/ncsi-cmd.c
@@ -54,7 +54,7 @@ static void ncsi_cmd_build_header(struct ncsi_pkt_hdr *h,
         checksum = ncsi_calculate_checksum((unsigned char *)h,
                                            sizeof(*h) + nca->payload);
         pchecksum = (__be32 *)((void *)h + sizeof(struct ncsi_pkt_hdr) +
-                    nca->payload);
+                    ALIGN(nca->payload, 4));
         *pchecksum = htonl(checksum);
 }
 
@@ -309,14 +309,21 @@ static struct ncsi_request *ncsi_alloc_command(struct ncsi_cmd_arg *nca)
 
 int ncsi_xmit_cmd(struct ncsi_cmd_arg *nca)
 {
+        struct ncsi_cmd_handler *nch = NULL;
         struct ncsi_request *nr;
+        unsigned char type;
         struct ethhdr *eh;
-        struct ncsi_cmd_handler *nch = NULL;
         int i, ret;
 
+        /* Use OEM generic handler for Netlink request */
+        if (nca->req_flags == NCSI_REQ_FLAG_NETLINK_DRIVEN)
+                type = NCSI_PKT_CMD_OEM;
+        else
+                type = nca->type;
+
         /* Search for the handler */
         for (i = 0; i < ARRAY_SIZE(ncsi_cmd_handlers); i++) {
-                if (ncsi_cmd_handlers[i].type == nca->type) {
+                if (ncsi_cmd_handlers[i].type == type) {
                         if (ncsi_cmd_handlers[i].handler)
                                 nch = &ncsi_cmd_handlers[i];
                         else