Skip to content

Commit fd5ef52

Browse files
pkitszelanguy11
pkitszel
authored and
anguy11
committed
ixgbe: wrap netdev_priv() usage
Wrap use of netdev_priv() in order to change the allocator of the device private structure from alloc_etherdev_mq() to the devlink in next commit. All but one netdev_priv() calls in the whole driver are replaced, the remaining one is called on MACVLAN (so not ixgbe) device. Signed-off-by: Przemek Kitszel <przemyslaw.kitszel@intel.com> Tested-by: Bharath R <bharath.r@intel.com> Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent 8982fc0 commit fd5ef52

File tree

8 files changed

+127
-122
lines changed

8 files changed

+127
-122
lines changed

‎drivers/net/ethernet/intel/ixgbe/ixgbe.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -830,6 +830,11 @@ struct ixgbe_adapter {
830830
spinlock_t vfs_lock;
831831
};
832832

833+
static inline struct ixgbe_adapter *ixgbe_from_netdev(struct net_device *netdev)
834+
{
835+
return netdev_priv(netdev);
836+
}
837+
833838
static inline int ixgbe_determine_xdp_q_idx(int cpu)
834839
{
835840
if (static_key_enabled(&ixgbe_xdp_locking_key))

‎drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@ static int ixgbe_copy_dcb_cfg(struct ixgbe_adapter *adapter, int tc_max)
118118

119119
static u8 ixgbe_dcbnl_get_state(struct net_device *netdev)
120120
{
121-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
121+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
122122

123123
return !!(adapter->flags & IXGBE_FLAG_DCB_ENABLED);
124124
}
125125

126126
static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
127127
{
128-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
128+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
129129

130130
/* Fail command if not in CEE mode */
131131
if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_CEE))
@@ -142,7 +142,7 @@ static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state)
142142
static void ixgbe_dcbnl_get_perm_hw_addr(struct net_device *netdev,
143143
u8 *perm_addr)
144144
{
145-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
145+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
146146
int i, j;
147147

148148
memset(perm_addr, 0xff, MAX_ADDR_LEN);
@@ -167,7 +167,7 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_tx(struct net_device *netdev, int tc,
167167
u8 prio, u8 bwg_id, u8 bw_pct,
168168
u8 up_map)
169169
{
170-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
170+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
171171

172172
if (prio != DCB_ATTR_VALUE_UNDEFINED)
173173
adapter->temp_dcb_cfg.tc_config[tc].path[0].prio_type = prio;
@@ -184,7 +184,7 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_tx(struct net_device *netdev, int tc,
184184
static void ixgbe_dcbnl_set_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,
185185
u8 bw_pct)
186186
{
187-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
187+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
188188

189189
adapter->temp_dcb_cfg.bw_percentage[0][bwg_id] = bw_pct;
190190
}
@@ -193,7 +193,7 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc,
193193
u8 prio, u8 bwg_id, u8 bw_pct,
194194
u8 up_map)
195195
{
196-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
196+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
197197

198198
if (prio != DCB_ATTR_VALUE_UNDEFINED)
199199
adapter->temp_dcb_cfg.tc_config[tc].path[1].prio_type = prio;
@@ -210,7 +210,7 @@ static void ixgbe_dcbnl_set_pg_tc_cfg_rx(struct net_device *netdev, int tc,
210210
static void ixgbe_dcbnl_set_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,
211211
u8 bw_pct)
212212
{
213-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
213+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
214214

215215
adapter->temp_dcb_cfg.bw_percentage[1][bwg_id] = bw_pct;
216216
}
@@ -219,7 +219,7 @@ static void ixgbe_dcbnl_get_pg_tc_cfg_tx(struct net_device *netdev, int tc,
219219
u8 *prio, u8 *bwg_id, u8 *bw_pct,
220220
u8 *up_map)
221221
{
222-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
222+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
223223

224224
*prio = adapter->dcb_cfg.tc_config[tc].path[0].prio_type;
225225
*bwg_id = adapter->dcb_cfg.tc_config[tc].path[0].bwg_id;
@@ -230,7 +230,7 @@ static void ixgbe_dcbnl_get_pg_tc_cfg_tx(struct net_device *netdev, int tc,
230230
static void ixgbe_dcbnl_get_pg_bwg_cfg_tx(struct net_device *netdev, int bwg_id,
231231
u8 *bw_pct)
232232
{
233-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
233+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
234234

235235
*bw_pct = adapter->dcb_cfg.bw_percentage[0][bwg_id];
236236
}
@@ -239,7 +239,7 @@ static void ixgbe_dcbnl_get_pg_tc_cfg_rx(struct net_device *netdev, int tc,
239239
u8 *prio, u8 *bwg_id, u8 *bw_pct,
240240
u8 *up_map)
241241
{
242-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
242+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
243243

244244
*prio = adapter->dcb_cfg.tc_config[tc].path[1].prio_type;
245245
*bwg_id = adapter->dcb_cfg.tc_config[tc].path[1].bwg_id;
@@ -250,15 +250,15 @@ static void ixgbe_dcbnl_get_pg_tc_cfg_rx(struct net_device *netdev, int tc,
250250
static void ixgbe_dcbnl_get_pg_bwg_cfg_rx(struct net_device *netdev, int bwg_id,
251251
u8 *bw_pct)
252252
{
253-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
253+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
254254

255255
*bw_pct = adapter->dcb_cfg.bw_percentage[1][bwg_id];
256256
}
257257

258258
static void ixgbe_dcbnl_set_pfc_cfg(struct net_device *netdev, int priority,
259259
u8 setting)
260260
{
261-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
261+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
262262

263263
adapter->temp_dcb_cfg.tc_config[priority].dcb_pfc = setting;
264264
if (adapter->temp_dcb_cfg.tc_config[priority].dcb_pfc !=
@@ -269,14 +269,14 @@ static void ixgbe_dcbnl_set_pfc_cfg(struct net_device *netdev, int priority,
269269
static void ixgbe_dcbnl_get_pfc_cfg(struct net_device *netdev, int priority,
270270
u8 *setting)
271271
{
272-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
272+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
273273

274274
*setting = adapter->dcb_cfg.tc_config[priority].dcb_pfc;
275275
}
276276

277277
static void ixgbe_dcbnl_devreset(struct net_device *dev)
278278
{
279-
struct ixgbe_adapter *adapter = netdev_priv(dev);
279+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);
280280

281281
while (test_and_set_bit(__IXGBE_RESETTING, &adapter->state))
282282
usleep_range(1000, 2000);
@@ -295,7 +295,7 @@ static void ixgbe_dcbnl_devreset(struct net_device *dev)
295295

296296
static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
297297
{
298-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
298+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
299299
struct ixgbe_dcb_config *dcb_cfg = &adapter->dcb_cfg;
300300
struct ixgbe_hw *hw = &adapter->hw;
301301
int ret = DCB_NO_HW_CHG;
@@ -383,7 +383,7 @@ static u8 ixgbe_dcbnl_set_all(struct net_device *netdev)
383383

384384
static u8 ixgbe_dcbnl_getcap(struct net_device *netdev, int capid, u8 *cap)
385385
{
386-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
386+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
387387

388388
switch (capid) {
389389
case DCB_CAP_ATTR_PG:
@@ -420,7 +420,7 @@ static u8 ixgbe_dcbnl_getcap(struct net_device *netdev, int capid, u8 *cap)
420420

421421
static int ixgbe_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num)
422422
{
423-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
423+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
424424

425425
if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) {
426426
switch (tcid) {
@@ -447,14 +447,14 @@ static int ixgbe_dcbnl_setnumtcs(struct net_device *netdev, int tcid, u8 num)
447447

448448
static u8 ixgbe_dcbnl_getpfcstate(struct net_device *netdev)
449449
{
450-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
450+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
451451

452452
return adapter->dcb_cfg.pfc_mode_enable;
453453
}
454454

455455
static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)
456456
{
457-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
457+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
458458

459459
adapter->temp_dcb_cfg.pfc_mode_enable = state;
460460
}
@@ -471,7 +471,7 @@ static void ixgbe_dcbnl_setpfcstate(struct net_device *netdev, u8 state)
471471
*/
472472
static int ixgbe_dcbnl_getapp(struct net_device *netdev, u8 idtype, u16 id)
473473
{
474-
struct ixgbe_adapter *adapter = netdev_priv(netdev);
474+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(netdev);
475475
struct dcb_app app = {
476476
.selector = idtype,
477477
.protocol = id,
@@ -486,7 +486,7 @@ static int ixgbe_dcbnl_getapp(struct net_device *netdev, u8 idtype, u16 id)
486486
static int ixgbe_dcbnl_ieee_getets(struct net_device *dev,
487487
struct ieee_ets *ets)
488488
{
489-
struct ixgbe_adapter *adapter = netdev_priv(dev);
489+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);
490490
struct ieee_ets *my_ets = adapter->ixgbe_ieee_ets;
491491

492492
ets->ets_cap = adapter->dcb_cfg.num_tcs.pg_tcs;
@@ -506,7 +506,7 @@ static int ixgbe_dcbnl_ieee_getets(struct net_device *dev,
506506
static int ixgbe_dcbnl_ieee_setets(struct net_device *dev,
507507
struct ieee_ets *ets)
508508
{
509-
struct ixgbe_adapter *adapter = netdev_priv(dev);
509+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);
510510
int max_frame = dev->mtu + ETH_HLEN + ETH_FCS_LEN;
511511
int i, err;
512512
__u8 max_tc = 0;
@@ -559,7 +559,7 @@ static int ixgbe_dcbnl_ieee_setets(struct net_device *dev,
559559
static int ixgbe_dcbnl_ieee_getpfc(struct net_device *dev,
560560
struct ieee_pfc *pfc)
561561
{
562-
struct ixgbe_adapter *adapter = netdev_priv(dev);
562+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);
563563
struct ieee_pfc *my_pfc = adapter->ixgbe_ieee_pfc;
564564
int i;
565565

@@ -584,7 +584,7 @@ static int ixgbe_dcbnl_ieee_getpfc(struct net_device *dev,
584584
static int ixgbe_dcbnl_ieee_setpfc(struct net_device *dev,
585585
struct ieee_pfc *pfc)
586586
{
587-
struct ixgbe_adapter *adapter = netdev_priv(dev);
587+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);
588588
struct ixgbe_hw *hw = &adapter->hw;
589589
u8 *prio_tc;
590590
int err;
@@ -616,7 +616,7 @@ static int ixgbe_dcbnl_ieee_setpfc(struct net_device *dev,
616616
static int ixgbe_dcbnl_ieee_setapp(struct net_device *dev,
617617
struct dcb_app *app)
618618
{
619-
struct ixgbe_adapter *adapter = netdev_priv(dev);
619+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);
620620
int err;
621621

622622
if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
@@ -661,7 +661,7 @@ static int ixgbe_dcbnl_ieee_setapp(struct net_device *dev,
661661
static int ixgbe_dcbnl_ieee_delapp(struct net_device *dev,
662662
struct dcb_app *app)
663663
{
664-
struct ixgbe_adapter *adapter = netdev_priv(dev);
664+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);
665665
int err;
666666

667667
if (!(adapter->dcbx_cap & DCB_CAP_DCBX_VER_IEEE))
@@ -705,13 +705,13 @@ static int ixgbe_dcbnl_ieee_delapp(struct net_device *dev,
705705

706706
static u8 ixgbe_dcbnl_getdcbx(struct net_device *dev)
707707
{
708-
struct ixgbe_adapter *adapter = netdev_priv(dev);
708+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);
709709
return adapter->dcbx_cap;
710710
}
711711

712712
static u8 ixgbe_dcbnl_setdcbx(struct net_device *dev, u8 mode)
713713
{
714-
struct ixgbe_adapter *adapter = netdev_priv(dev);
714+
struct ixgbe_adapter *adapter = ixgbe_from_netdev(dev);
715715
struct ieee_ets ets = {0};
716716
struct ieee_pfc pfc = {0};
717717
int err = 0;

0 commit comments

Comments
 (0)