Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.7.4 fixes for EL9 #91

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,15 @@ Installation
------------
To install from source please run ``make`` and ``sudo make install`` from the top level.

RPM Build
---------
Run:
```
$ export exanic_version=2.7.4
$ (cd .. && tar -czf $HOME/rpmbuild/SOURCES/exanic-${exanic_version}.tar.gz exanic-software --transform=s#exanic-software/#exanic-${exanic_version}/#g)
$ rpmbuild -ba -D 'debug_package %{nil}' exanic.spec
```

Support
-------
Complete documentation is available from our [website](https://www.cisco.com/c/en/us/td/docs/dcn/nexus3550/smartnic/sw/user-guide/cisco-nexus-smartnic-user-guide/index.html). For other questions and comments, you can contact Cisco TAC support team.
Expand Down
4 changes: 2 additions & 2 deletions exanic.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: exanic
Version: 2.7.2-git
Release: 1%{?dist}
Version: 2.7.4
Release: 2%{?dist}

Summary: ExaNIC drivers and software
Group: System Environment/Kernel
Expand Down
12 changes: 0 additions & 12 deletions modules/exanic/exanic-main.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
#include <linux/pci-aspm.h>
#endif
#include <linux/interrupt.h>
#if defined(CONFIG_PCIEAER)
#include <linux/aer.h>
#endif
#include <linux/fs.h>
#include <linux/delay.h>
#include <linux/if_arp.h>
Expand Down Expand Up @@ -1058,9 +1055,6 @@ static int exanic_probe(struct pci_dev *pdev,
goto err_req_regions;
}

#if defined(CONFIG_PCIEAER)
pci_enable_pcie_error_reporting(pdev);
#endif
pci_set_master(pdev);
pci_set_drvdata(pdev, exanic);
exanic->pci_dev = pdev;
Expand Down Expand Up @@ -1883,9 +1877,6 @@ static int exanic_probe(struct pci_dev *pdev,
err_regs_ioremap:
err_regs_size:
err_regs_bar_type:
#if defined(CONFIG_PCIEAER)
pci_disable_pcie_error_reporting(pdev);
#endif
pci_release_regions(pdev);
err_req_regions:
pci_disable_device(pdev);
Expand Down Expand Up @@ -2002,9 +1993,6 @@ static void exanic_remove(struct pci_dev *pdev)
if (exanic->regs_virt != NULL)
iounmap(exanic->regs_virt);

#if defined(CONFIG_PCIEAER)
pci_disable_pcie_error_reporting(pdev);
#endif
pci_release_regions(pdev);
pci_disable_device(pdev);
}
Expand Down
2 changes: 1 addition & 1 deletion modules/exanic/exanic-netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -1888,7 +1888,7 @@ static int exanic_netdev_poll(struct napi_struct *napi, int budget)
if (exanic_rx_ready(rx))
{
/* Poll again as soon as possible */
napi_reschedule(napi);
napi_schedule(napi);
}
else if (priv->rx_coalesce_timeout_ns > 0)
{
Expand Down
8 changes: 4 additions & 4 deletions modules/exasock/exasock-bonding-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ exabond_get_sysfs_namespace(struct class *cls,
#endif

static ssize_t
exabond_masters_show(struct class *c,
exabond_masters_show(const struct class *c,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34)
struct class_attribute *cattr,
const struct class_attribute *cattr,
#endif
char *buf)
{
Expand Down Expand Up @@ -71,9 +71,9 @@ exabond_masters_show(struct class *c,
}

static ssize_t
exabond_masters_store(struct class *c,
exabond_masters_store(const struct class *c,
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34)
struct class_attribute *cattr,
const struct class_attribute *cattr,
#endif
const char *buf, size_t count)
{
Expand Down