]> www.infradead.org Git - users/jedix/linux-maple.git/commit
cnic: Fix mmap regression.
authorJoe Jin <joe.jin@oracle.com>
Mon, 27 Aug 2012 11:10:01 +0000 (19:10 +0800)
committerJoe Jin <joe.jin@oracle.com>
Tue, 28 Aug 2012 07:23:16 +0000 (15:23 +0800)
commit1305becd7afc8d94d0073d8710d16d10feb08a87
treebc46e947f1cb73f5b155339399b785d0b1b100b2
parentd1c08f4d1b3ec8ea1ebd72e830c3916b5ae2af24
cnic: Fix mmap regression.

commit 1f85d58cdf15354a7120fc9ccc9bb9c45b53af88
    cnic: Remove uio mem[0].

introduced a regression as older versions of userspace app still rely
on this mmap.  Restore the mmap functionality and get the base address
from pci_resource_start() as the nedev->base_addr has been deprecated for
PCI devices.

Update version to 2.5.12.

(backported from upstream commit ae0eef66088777cf252c6b91d3eb5ef2f30a67c5)
Signed-off-by: Michael Chan <mchan@broadocm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
drivers/net/cnic.c
drivers/net/cnic_if.h