Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
9ca36f7d
Commit
9ca36f7d
authored
Nov 16, 2011
by
David S. Miller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
infiniband: Update net drivers for netdev_features_t changes.
Signed-off-by:
David S. Miller
<
davem@davemloft.net
>
parent
34324dc2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
drivers/infiniband/hw/nes/nes_nic.c
drivers/infiniband/hw/nes/nes_nic.c
+3
-3
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/infiniband/ulp/ipoib/ipoib_main.c
+1
-1
No files found.
drivers/infiniband/hw/nes/nes_nic.c
View file @
9ca36f7d
...
...
@@ -1589,7 +1589,7 @@ static const struct ethtool_ops nes_ethtool_ops = {
.
set_pauseparam
=
nes_netdev_set_pauseparam
,
};
static
void
nes_vlan_mode
(
struct
net_device
*
netdev
,
struct
nes_device
*
nesdev
,
u32
features
)
static
void
nes_vlan_mode
(
struct
net_device
*
netdev
,
struct
nes_device
*
nesdev
,
netdev_features_t
features
)
{
struct
nes_adapter
*
nesadapter
=
nesdev
->
nesadapter
;
u32
u32temp
;
...
...
@@ -1610,7 +1610,7 @@ static void nes_vlan_mode(struct net_device *netdev, struct nes_device *nesdev,
spin_unlock_irqrestore
(
&
nesadapter
->
phy_lock
,
flags
);
}
static
u32
nes_fix_features
(
struct
net_device
*
netdev
,
u32
features
)
static
netdev_features_t
nes_fix_features
(
struct
net_device
*
netdev
,
netdev_features_t
features
)
{
/*
* Since there is no support for separate rx/tx vlan accel
...
...
@@ -1624,7 +1624,7 @@ static u32 nes_fix_features(struct net_device *netdev, u32 features)
return
features
;
}
static
int
nes_set_features
(
struct
net_device
*
netdev
,
u32
features
)
static
int
nes_set_features
(
struct
net_device
*
netdev
,
netdev_features_t
features
)
{
struct
nes_vnic
*
nesvnic
=
netdev_priv
(
netdev
);
struct
nes_device
*
nesdev
=
nesvnic
->
nesdev
;
...
...
drivers/infiniband/ulp/ipoib/ipoib_main.c
View file @
9ca36f7d
...
...
@@ -171,7 +171,7 @@ static int ipoib_stop(struct net_device *dev)
return
0
;
}
static
u32
ipoib_fix_features
(
struct
net_device
*
dev
,
u32
features
)
static
netdev_features_t
ipoib_fix_features
(
struct
net_device
*
dev
,
netdev_features_t
features
)
{
struct
ipoib_dev_priv
*
priv
=
netdev_priv
(
dev
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment