| .. | .. |
|---|
| 1 | | -/* |
|---|
| 2 | | - * Copyright (C) 2015-2017 Netronome Systems, Inc. |
|---|
| 3 | | - * |
|---|
| 4 | | - * This software is dual licensed under the GNU General License Version 2, |
|---|
| 5 | | - * June 1991 as shown in the file COPYING in the top-level directory of this |
|---|
| 6 | | - * source tree or the BSD 2-Clause License provided below. You have the |
|---|
| 7 | | - * option to license this software under the complete terms of either license. |
|---|
| 8 | | - * |
|---|
| 9 | | - * The BSD 2-Clause License: |
|---|
| 10 | | - * |
|---|
| 11 | | - * Redistribution and use in source and binary forms, with or |
|---|
| 12 | | - * without modification, are permitted provided that the following |
|---|
| 13 | | - * conditions are met: |
|---|
| 14 | | - * |
|---|
| 15 | | - * 1. Redistributions of source code must retain the above |
|---|
| 16 | | - * copyright notice, this list of conditions and the following |
|---|
| 17 | | - * disclaimer. |
|---|
| 18 | | - * |
|---|
| 19 | | - * 2. Redistributions in binary form must reproduce the above |
|---|
| 20 | | - * copyright notice, this list of conditions and the following |
|---|
| 21 | | - * disclaimer in the documentation and/or other materials |
|---|
| 22 | | - * provided with the distribution. |
|---|
| 23 | | - * |
|---|
| 24 | | - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, |
|---|
| 25 | | - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF |
|---|
| 26 | | - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|---|
| 27 | | - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS |
|---|
| 28 | | - * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN |
|---|
| 29 | | - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN |
|---|
| 30 | | - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
|---|
| 31 | | - * SOFTWARE. |
|---|
| 32 | | - */ |
|---|
| 1 | +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) |
|---|
| 2 | +/* Copyright (C) 2015-2017 Netronome Systems, Inc. */ |
|---|
| 33 | 3 | |
|---|
| 34 | 4 | /* Authors: David Brunecz <david.brunecz@netronome.com> |
|---|
| 35 | 5 | * Jakub Kicinski <jakub.kicinski@netronome.com> |
|---|
| .. | .. |
|---|
| 236 | 206 | if (entry->interface == NFP_INTERFACE_NONE) { |
|---|
| 237 | 207 | entry->port_type = PORT_NONE; |
|---|
| 238 | 208 | return; |
|---|
| 209 | + } else if (entry->interface == NFP_INTERFACE_RJ45) { |
|---|
| 210 | + entry->port_type = PORT_TP; |
|---|
| 211 | + return; |
|---|
| 239 | 212 | } |
|---|
| 240 | 213 | |
|---|
| 241 | 214 | if (entry->media == NFP_MEDIA_FIBRE) |
|---|
| .. | .. |
|---|
| 299 | 272 | goto err; |
|---|
| 300 | 273 | } |
|---|
| 301 | 274 | |
|---|
| 302 | | - table = kzalloc(sizeof(*table) + |
|---|
| 303 | | - sizeof(struct nfp_eth_table_port) * cnt, GFP_KERNEL); |
|---|
| 275 | + table = kzalloc(struct_size(table, ports, cnt), GFP_KERNEL); |
|---|
| 304 | 276 | if (!table) |
|---|
| 305 | 277 | goto err; |
|---|
| 306 | 278 | |
|---|
